Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev
diff --git a/Android.mk b/Android.mk
index 4a97c28..80b860b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -329,12 +329,7 @@
media/java/android/media/projection/IMediaProjection.aidl \
media/java/android/media/projection/IMediaProjectionCallback.aidl \
media/java/android/media/projection/IMediaProjectionManager.aidl \
- media/java/android/media/routing/IMediaRouteService.aidl \
- media/java/android/media/routing/IMediaRouteClientCallback.aidl \
- media/java/android/media/routing/IMediaRouter.aidl \
- media/java/android/media/routing/IMediaRouterDelegate.aidl \
- media/java/android/media/routing/IMediaRouterRoutingCallback.aidl \
- media/java/android/media/routing/IMediaRouterStateCallback.aidl \
+ media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl \
media/java/android/media/session/IActiveSessionsListener.aidl \
media/java/android/media/session/ISessionController.aidl \
media/java/android/media/session/ISessionControllerCallback.aidl \
@@ -350,8 +345,8 @@
media/java/android/media/tv/ITvInputServiceCallback.aidl \
media/java/android/media/tv/ITvInputSession.aidl \
media/java/android/media/tv/ITvInputSessionCallback.aidl \
- telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl \
- telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl \
+ telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl \
+ telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl \
telecomm/java/com/android/internal/telecomm/IConnectionService.aidl \
telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl \
telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl \
@@ -496,7 +491,6 @@
frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
frameworks/base/media/java/android/media/MediaMetadata.aidl \
frameworks/base/media/java/android/media/Rating.aidl \
- frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \
frameworks/base/media/java/android/media/session/MediaSession.aidl \
frameworks/base/media/java/android/media/session/PlaybackState.aidl \
frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
diff --git a/CleanSpec.mk b/CleanSpec.mk
index ae2f3ad..c7cf940 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -218,6 +218,9 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services.core_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services.core_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates)
# ******************************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
diff --git a/api/current.txt b/api/current.txt
index dbc1dcc..0d8aeba 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23,7 +23,6 @@
field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
- field public static final java.lang.String BIND_MEDIA_ROUTE_SERVICE = "android.permission.BIND_MEDIA_ROUTE_SERVICE";
field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
@@ -114,7 +113,6 @@
field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
- field public static final java.lang.String RECOVERY = "android.permission.RECOVERY";
field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
@@ -272,14 +270,14 @@
field public static final int action = 16842797; // 0x101002d
field public static final int actionBarDivider = 16843675; // 0x101039b
field public static final int actionBarItemBackground = 16843676; // 0x101039c
- field public static final int actionBarPopupTheme = 16843919; // 0x101048f
+ field public static final int actionBarPopupTheme = 16843917; // 0x101048d
field public static final int actionBarSize = 16843499; // 0x10102eb
field public static final int actionBarSplitStyle = 16843656; // 0x1010388
field public static final int actionBarStyle = 16843470; // 0x10102ce
field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4
field public static final int actionBarTabStyle = 16843507; // 0x10102f3
field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5
- field public static final int actionBarTheme = 16843827; // 0x1010433
+ field public static final int actionBarTheme = 16843825; // 0x1010431
field public static final int actionBarWidgetTheme = 16843671; // 0x1010397
field public static final int actionButtonStyle = 16843480; // 0x10102d8
field public static final int actionDropDownStyle = 16843479; // 0x10102d7
@@ -291,15 +289,15 @@
field public static final int actionModeCloseDrawable = 16843484; // 0x10102dc
field public static final int actionModeCopyDrawable = 16843538; // 0x1010312
field public static final int actionModeCutDrawable = 16843537; // 0x1010311
- field public static final int actionModeFindDrawable = 16843900; // 0x101047c
+ field public static final int actionModeFindDrawable = 16843898; // 0x101047a
field public static final int actionModePasteDrawable = 16843539; // 0x1010313
field public static final int actionModeSelectAllDrawable = 16843646; // 0x101037e
- field public static final int actionModeShareDrawable = 16843899; // 0x101047b
+ field public static final int actionModeShareDrawable = 16843897; // 0x1010479
field public static final int actionModeSplitBackground = 16843677; // 0x101039d
field public static final int actionModeStyle = 16843668; // 0x1010394
- field public static final int actionModeWebSearchDrawable = 16843901; // 0x101047d
+ field public static final int actionModeWebSearchDrawable = 16843899; // 0x101047b
field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6
- field public static final int actionOverflowMenuStyle = 16843846; // 0x1010446
+ field public static final int actionOverflowMenuStyle = 16843844; // 0x1010444
field public static final int actionProviderClass = 16843657; // 0x1010389
field public static final int actionViewClass = 16843516; // 0x10102fc
field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd
@@ -326,8 +324,8 @@
field public static final int alphabeticShortcut = 16843235; // 0x10101e3
field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef
field public static final int alwaysRetainTaskState = 16843267; // 0x1010203
- field public static final int amPmBackgroundColor = 16843944; // 0x10104a8
- field public static final int amPmTextColor = 16843943; // 0x10104a7
+ field public static final int amPmBackgroundColor = 16843942; // 0x10104a6
+ field public static final int amPmTextColor = 16843941; // 0x10104a5
field public static final int angle = 16843168; // 0x10101a0
field public static final int animateFirstView = 16843477; // 0x10102d5
field public static final int animateLayoutChanges = 16843506; // 0x10102f2
@@ -347,7 +345,7 @@
field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
field public static final int autoLink = 16842928; // 0x10100b0
field public static final int autoMirrored = 16843754; // 0x10103ea
- field public static final int autoRemoveFromRecents = 16843849; // 0x1010449
+ field public static final int autoRemoveFromRecents = 16843847; // 0x1010447
field public static final int autoStart = 16843445; // 0x10102b5
field public static final deprecated int autoText = 16843114; // 0x101016a
field public static final int autoUrlDetect = 16843404; // 0x101028c
@@ -356,8 +354,8 @@
field public static final int backgroundDimEnabled = 16843295; // 0x101021f
field public static final int backgroundSplit = 16843659; // 0x101038b
field public static final int backgroundStacked = 16843658; // 0x101038a
- field public static final int backgroundTint = 16843885; // 0x101046d
- field public static final int backgroundTintMode = 16843886; // 0x101046e
+ field public static final int backgroundTint = 16843883; // 0x101046b
+ field public static final int backgroundTintMode = 16843884; // 0x101046c
field public static final int backupAgent = 16843391; // 0x101027f
field public static final int banner = 16843762; // 0x10103f2
field public static final int baseline = 16843548; // 0x101031c
@@ -377,18 +375,18 @@
field public static final int bufferType = 16843086; // 0x101014e
field public static final int button = 16843015; // 0x1010107
field public static final int buttonBarButtonStyle = 16843567; // 0x101032f
- field public static final int buttonBarNegativeButtonStyle = 16843917; // 0x101048d
- field public static final int buttonBarNeutralButtonStyle = 16843916; // 0x101048c
- field public static final int buttonBarPositiveButtonStyle = 16843915; // 0x101048b
+ field public static final int buttonBarNegativeButtonStyle = 16843915; // 0x101048b
+ field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a
+ field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489
field public static final int buttonBarStyle = 16843566; // 0x101032e
field public static final int buttonStyle = 16842824; // 0x1010048
field public static final int buttonStyleInset = 16842826; // 0x101004a
field public static final int buttonStyleSmall = 16842825; // 0x1010049
field public static final int buttonStyleToggle = 16842827; // 0x101004b
- field public static final int buttonTint = 16843889; // 0x1010471
- field public static final int buttonTintMode = 16843890; // 0x1010472
+ field public static final int buttonTint = 16843887; // 0x101046f
+ field public static final int buttonTintMode = 16843888; // 0x1010470
field public static final int cacheColorHint = 16843009; // 0x1010101
- field public static final int calendarTextColor = 16843933; // 0x101049d
+ field public static final int calendarTextColor = 16843931; // 0x101049b
field public static final int calendarViewShown = 16843596; // 0x101034c
field public static final int calendarViewStyle = 16843613; // 0x101035d
field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8
@@ -406,8 +404,8 @@
field public static final int centerY = 16843171; // 0x10101a3
field public static final int checkBoxPreferenceStyle = 16842895; // 0x101008f
field public static final int checkMark = 16843016; // 0x1010108
- field public static final int checkMarkTint = 16843946; // 0x10104aa
- field public static final int checkMarkTintMode = 16843947; // 0x10104ab
+ field public static final int checkMarkTint = 16843944; // 0x10104a8
+ field public static final int checkMarkTintMode = 16843945; // 0x10104a9
field public static final int checkable = 16843237; // 0x10101e5
field public static final int checkableBehavior = 16843232; // 0x10101e0
field public static final int checkboxStyle = 16842860; // 0x101006c
@@ -426,31 +424,31 @@
field public static final int clipChildren = 16842986; // 0x10100ea
field public static final int clipOrientation = 16843274; // 0x101020a
field public static final int clipToPadding = 16842987; // 0x10100eb
- field public static final int closeIcon = 16843907; // 0x1010483
+ field public static final int closeIcon = 16843905; // 0x1010481
field public static final int codes = 16843330; // 0x1010242
field public static final int collapseColumns = 16843083; // 0x101014b
field public static final int color = 16843173; // 0x10101a5
- field public static final int colorAccent = 16843831; // 0x1010437
+ field public static final int colorAccent = 16843829; // 0x1010435
field public static final int colorActivatedHighlight = 16843664; // 0x1010390
field public static final int colorBackground = 16842801; // 0x1010031
field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab
- field public static final int colorButtonNormal = 16843821; // 0x101042d
- field public static final int colorControlActivated = 16843820; // 0x101042c
- field public static final int colorControlHighlight = 16843822; // 0x101042e
- field public static final int colorControlNormal = 16843819; // 0x101042b
+ field public static final int colorButtonNormal = 16843819; // 0x101042b
+ field public static final int colorControlActivated = 16843818; // 0x101042a
+ field public static final int colorControlHighlight = 16843820; // 0x101042c
+ field public static final int colorControlNormal = 16843817; // 0x1010429
field public static final int colorFocusedHighlight = 16843663; // 0x101038f
field public static final int colorForeground = 16842800; // 0x1010030
field public static final int colorForegroundInverse = 16843270; // 0x1010206
field public static final int colorLongPressedHighlight = 16843662; // 0x101038e
field public static final int colorMultiSelectHighlight = 16843665; // 0x1010391
field public static final int colorPressedHighlight = 16843661; // 0x101038d
- field public static final int colorPrimary = 16843829; // 0x1010435
- field public static final int colorPrimaryDark = 16843830; // 0x1010436
+ field public static final int colorPrimary = 16843827; // 0x1010433
+ field public static final int colorPrimaryDark = 16843828; // 0x1010434
field public static final int columnCount = 16843639; // 0x1010377
field public static final int columnDelay = 16843215; // 0x10101cf
field public static final int columnOrderPreserved = 16843640; // 0x1010378
field public static final int columnWidth = 16843031; // 0x1010117
- field public static final int commitIcon = 16843911; // 0x1010487
+ field public static final int commitIcon = 16843909; // 0x1010485
field public static final int compatibleWidthLimitDp = 16843621; // 0x1010365
field public static final int completionHint = 16843122; // 0x1010172
field public static final int completionHintView = 16843123; // 0x1010173
@@ -461,11 +459,10 @@
field public static final int content = 16843355; // 0x101025b
field public static final int contentAuthority = 16843408; // 0x1010290
field public static final int contentDescription = 16843379; // 0x1010273
- field public static final int contentInsetEnd = 16843862; // 0x1010456
- field public static final int contentInsetLeft = 16843863; // 0x1010457
- field public static final int contentInsetRight = 16843864; // 0x1010458
- field public static final int contentInsetStart = 16843861; // 0x1010455
- field public static final int contentRatingSystemXml = 16843957; // 0x10104b5
+ field public static final int contentInsetEnd = 16843860; // 0x1010454
+ field public static final int contentInsetLeft = 16843861; // 0x1010455
+ field public static final int contentInsetRight = 16843862; // 0x1010456
+ field public static final int contentInsetStart = 16843859; // 0x1010453
field public static final int controlX1 = 16843798; // 0x1010416
field public static final int controlX2 = 16843800; // 0x1010418
field public static final int controlY1 = 16843799; // 0x1010417
@@ -478,12 +475,12 @@
field public static final int dashGap = 16843175; // 0x10101a7
field public static final int dashWidth = 16843174; // 0x10101a6
field public static final int data = 16842798; // 0x101002e
- field public static final int datePickerDialogTheme = 16843951; // 0x10104af
- field public static final int datePickerMode = 16843958; // 0x10104b6
+ field public static final int datePickerDialogTheme = 16843949; // 0x10104ad
+ field public static final int datePickerMode = 16843956; // 0x10104b4
field public static final int datePickerStyle = 16843612; // 0x101035c
field public static final int dateTextAppearance = 16843593; // 0x1010349
- field public static final int dayOfWeekBackgroundColor = 16843926; // 0x1010496
- field public static final int dayOfWeekTextAppearance = 16843927; // 0x1010497
+ field public static final int dayOfWeekBackgroundColor = 16843924; // 0x1010494
+ field public static final int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
field public static final int defaultValue = 16843245; // 0x10101ed
field public static final int delay = 16843212; // 0x10101cc
@@ -514,7 +511,7 @@
field public static final int dividerHorizontal = 16843564; // 0x101032c
field public static final int dividerPadding = 16843562; // 0x101032a
field public static final int dividerVertical = 16843530; // 0x101030a
- field public static final int documentLaunchMode = 16843847; // 0x1010447
+ field public static final int documentLaunchMode = 16843845; // 0x1010445
field public static final int drawSelectorOnTop = 16843004; // 0x10100fc
field public static final int drawable = 16843161; // 0x1010199
field public static final int drawableBottom = 16843118; // 0x101016e
@@ -543,8 +540,8 @@
field public static final int editTextStyle = 16842862; // 0x101006e
field public static final deprecated int editable = 16843115; // 0x101016b
field public static final int editorExtras = 16843300; // 0x1010224
- field public static final int elegantTextHeight = 16843871; // 0x101045f
- field public static final int elevation = 16843842; // 0x1010442
+ field public static final int elegantTextHeight = 16843869; // 0x101045d
+ field public static final int elevation = 16843840; // 0x1010440
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
@@ -554,10 +551,10 @@
field public static final int entries = 16842930; // 0x10100b2
field public static final int entryValues = 16843256; // 0x10101f8
field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d
- field public static final int excludeClass = 16843844; // 0x1010444
+ field public static final int excludeClass = 16843842; // 0x1010442
field public static final int excludeFromRecents = 16842775; // 0x1010017
- field public static final int excludeId = 16843843; // 0x1010443
- field public static final int excludeName = 16843856; // 0x1010450
+ field public static final int excludeId = 16843841; // 0x1010441
+ field public static final int excludeName = 16843854; // 0x101044e
field public static final int exitFadeDuration = 16843533; // 0x101030d
field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
@@ -588,7 +585,7 @@
field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339
field public static final int fillAfter = 16843197; // 0x10101bd
field public static final int fillBefore = 16843196; // 0x10101bc
- field public static final int fillColor = 16843807; // 0x101041f
+ field public static final int fillColor = 16843806; // 0x101041e
field public static final int fillEnabled = 16843343; // 0x101024f
field public static final int fillViewport = 16843130; // 0x101017a
field public static final int filter = 16843035; // 0x101011b
@@ -602,12 +599,12 @@
field public static final int focusableInTouchMode = 16842971; // 0x10100db
field public static final int focusedMonthDateColor = 16843587; // 0x1010343
field public static final int fontFamily = 16843692; // 0x10103ac
- field public static final int fontFeatureSettings = 16843962; // 0x10104ba
+ field public static final int fontFeatureSettings = 16843960; // 0x10104b8
field public static final int footerDividersEnabled = 16843311; // 0x101022f
field public static final int foreground = 16843017; // 0x1010109
field public static final int foregroundGravity = 16843264; // 0x1010200
- field public static final int foregroundTint = 16843887; // 0x101046f
- field public static final int foregroundTintMode = 16843888; // 0x1010470
+ field public static final int foregroundTint = 16843885; // 0x101046d
+ field public static final int foregroundTintMode = 16843886; // 0x101046e
field public static final int format = 16843013; // 0x1010105
field public static final int format12Hour = 16843722; // 0x10103ca
field public static final int format24Hour = 16843723; // 0x10103cb
@@ -621,13 +618,13 @@
field public static final int freezesText = 16843116; // 0x101016c
field public static final int fromAlpha = 16843210; // 0x10101ca
field public static final int fromDegrees = 16843187; // 0x10101b3
- field public static final int fromId = 16843852; // 0x101044c
+ field public static final int fromId = 16843850; // 0x101044a
field public static final int fromScene = 16843741; // 0x10103dd
field public static final int fromXDelta = 16843206; // 0x10101c6
field public static final int fromXScale = 16843202; // 0x10101c2
field public static final int fromYDelta = 16843208; // 0x10101c8
field public static final int fromYScale = 16843204; // 0x10101c4
- field public static final int fullBackupOnly = 16843893; // 0x1010475
+ field public static final int fullBackupOnly = 16843891; // 0x1010473
field public static final int fullBright = 16842954; // 0x10100ca
field public static final int fullDark = 16842950; // 0x10100c6
field public static final int functionalTest = 16842787; // 0x1010023
@@ -640,7 +637,7 @@
field public static final int gestureStrokeType = 16843385; // 0x1010279
field public static final int gestureStrokeWidth = 16843380; // 0x1010274
field public static final int glEsVersion = 16843393; // 0x1010281
- field public static final int goIcon = 16843908; // 0x1010484
+ field public static final int goIcon = 16843906; // 0x1010482
field public static final int gradientRadius = 16843172; // 0x10101a4
field public static final int grantUriPermissions = 16842779; // 0x101001b
field public static final int gravity = 16842927; // 0x10100af
@@ -653,16 +650,16 @@
field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e
field public static final int hardwareAccelerated = 16843475; // 0x10102d3
field public static final int hasCode = 16842764; // 0x101000c
- field public static final int headerAmPmTextAppearance = 16843938; // 0x10104a2
+ field public static final int headerAmPmTextAppearance = 16843936; // 0x10104a0
field public static final int headerBackground = 16843055; // 0x101012f
- field public static final int headerBackgroundColor = 16843939; // 0x10104a3
- field public static final int headerDayOfMonthTextAppearance = 16843929; // 0x1010499
+ field public static final int headerBackgroundColor = 16843937; // 0x10104a1
+ field public static final int headerDayOfMonthTextAppearance = 16843927; // 0x1010497
field public static final int headerDividersEnabled = 16843310; // 0x101022e
- field public static final int headerMonthTextAppearance = 16843928; // 0x1010498
- field public static final int headerTimeTextAppearance = 16843937; // 0x10104a1
- field public static final int headerYearTextAppearance = 16843930; // 0x101049a
+ field public static final int headerMonthTextAppearance = 16843926; // 0x1010496
+ field public static final int headerTimeTextAppearance = 16843935; // 0x101049f
+ field public static final int headerYearTextAppearance = 16843928; // 0x1010498
field public static final int height = 16843093; // 0x1010155
- field public static final int hideOnContentScroll = 16843845; // 0x1010445
+ field public static final int hideOnContentScroll = 16843843; // 0x1010443
field public static final int hint = 16843088; // 0x1010150
field public static final int homeAsUpIndicator = 16843531; // 0x101030b
field public static final int homeLayout = 16843549; // 0x101031d
@@ -698,8 +695,8 @@
field public static final int indeterminateDuration = 16843069; // 0x101013d
field public static final int indeterminateOnly = 16843066; // 0x101013a
field public static final int indeterminateProgressStyle = 16843544; // 0x1010318
- field public static final int indeterminateTint = 16843883; // 0x101046b
- field public static final int indeterminateTintMode = 16843884; // 0x101046c
+ field public static final int indeterminateTint = 16843881; // 0x1010469
+ field public static final int indeterminateTintMode = 16843882; // 0x101046a
field public static final int indicatorEnd = 16843730; // 0x10103d2
field public static final int indicatorLeft = 16843021; // 0x101010d
field public static final int indicatorRight = 16843022; // 0x101010e
@@ -712,7 +709,7 @@
field public static final int innerRadiusRatio = 16843163; // 0x101019b
field public static final deprecated int inputMethod = 16843112; // 0x1010168
field public static final int inputType = 16843296; // 0x1010220
- field public static final int inset = 16843960; // 0x10104b8
+ field public static final int inset = 16843958; // 0x10104b6
field public static final int insetBottom = 16843194; // 0x10101ba
field public static final int insetLeft = 16843191; // 0x10101b7
field public static final int insetRight = 16843192; // 0x10101b8
@@ -786,8 +783,8 @@
field public static final int largeScreens = 16843398; // 0x1010286
field public static final int largestWidthLimitDp = 16843622; // 0x1010366
field public static final int launchMode = 16842781; // 0x101001d
- field public static final int launchTaskBehindBackgroundAnimation = 16843923; // 0x1010493
- field public static final int launchTaskBehindSourceAnimation = 16843924; // 0x1010494
+ field public static final int launchTaskBehindBackgroundAnimation = 16843921; // 0x1010491
+ field public static final int launchTaskBehindSourceAnimation = 16843922; // 0x1010492
field public static final int layerType = 16843604; // 0x1010354
field public static final int layout = 16842994; // 0x10100f2
field public static final int layoutAnimation = 16842988; // 0x10100ec
@@ -814,7 +811,7 @@
field public static final int layout_centerVertical = 16843153; // 0x1010191
field public static final int layout_column = 16843084; // 0x101014c
field public static final int layout_columnSpan = 16843645; // 0x101037d
- field public static final int layout_columnWeight = 16843867; // 0x101045b
+ field public static final int layout_columnWeight = 16843865; // 0x1010459
field public static final int layout_gravity = 16842931; // 0x10100b3
field public static final int layout_height = 16842997; // 0x10100f5
field public static final int layout_margin = 16842998; // 0x10100f6
@@ -826,7 +823,7 @@
field public static final int layout_marginTop = 16843000; // 0x10100f8
field public static final int layout_row = 16843643; // 0x101037b
field public static final int layout_rowSpan = 16843644; // 0x101037c
- field public static final int layout_rowWeight = 16843866; // 0x101045a
+ field public static final int layout_rowWeight = 16843864; // 0x1010458
field public static final int layout_scale = 16843155; // 0x1010193
field public static final int layout_span = 16843085; // 0x101014d
field public static final int layout_toEndOf = 16843704; // 0x10103b8
@@ -838,7 +835,7 @@
field public static final int layout_x = 16843135; // 0x101017f
field public static final int layout_y = 16843136; // 0x1010180
field public static final int left = 16843181; // 0x10101ad
- field public static final int letterSpacing = 16843961; // 0x10104b9
+ field public static final int letterSpacing = 16843959; // 0x10104b7
field public static final int lineSpacingExtra = 16843287; // 0x1010217
field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
field public static final int lines = 16843092; // 0x1010154
@@ -866,7 +863,7 @@
field public static final int manageSpaceActivity = 16842756; // 0x1010004
field public static final int mapViewStyle = 16842890; // 0x101008a
field public static final int marqueeRepeatLimit = 16843293; // 0x101021d
- field public static final int matchOrder = 16843857; // 0x1010451
+ field public static final int matchOrder = 16843855; // 0x101044f
field public static final int max = 16843062; // 0x1010136
field public static final int maxDate = 16843584; // 0x1010340
field public static final int maxEms = 16843095; // 0x1010157
@@ -875,11 +872,11 @@
field public static final int maxLength = 16843104; // 0x1010160
field public static final int maxLevel = 16843186; // 0x10101b2
field public static final int maxLines = 16843091; // 0x1010153
- field public static final int maxRecents = 16843848; // 0x1010448
+ field public static final int maxRecents = 16843846; // 0x1010446
field public static final int maxRows = 16843059; // 0x1010133
field public static final int maxSdkVersion = 16843377; // 0x1010271
field public static final int maxWidth = 16843039; // 0x101011f
- field public static final int maximumAngle = 16843905; // 0x1010481
+ field public static final int maximumAngle = 16843903; // 0x101047f
field public static final int measureAllChildren = 16843018; // 0x101010a
field public static final int measureWithLargestChild = 16843476; // 0x10102d4
field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad
@@ -895,19 +892,19 @@
field public static final int minResizeWidth = 16843669; // 0x1010395
field public static final int minSdkVersion = 16843276; // 0x101020c
field public static final int minWidth = 16843071; // 0x101013f
- field public static final int minimumHorizontalAngle = 16843903; // 0x101047f
- field public static final int minimumVerticalAngle = 16843904; // 0x1010480
+ field public static final int minimumHorizontalAngle = 16843901; // 0x101047d
+ field public static final int minimumVerticalAngle = 16843902; // 0x101047e
field public static final int mipMap = 16843725; // 0x10103cd
field public static final int mirrorForRtl = 16843726; // 0x10103ce
field public static final int mode = 16843134; // 0x101017e
field public static final int moreIcon = 16843061; // 0x1010135
- field public static final int multiArch = 16843920; // 0x1010490
+ field public static final int multiArch = 16843918; // 0x101048e
field public static final int multiprocess = 16842771; // 0x1010013
field public static final int name = 16842755; // 0x1010003
- field public static final int navigationBarColor = 16843860; // 0x1010454
+ field public static final int navigationBarColor = 16843858; // 0x1010452
field public static final int navigationMode = 16843471; // 0x10102cf
field public static final int negativeButtonText = 16843254; // 0x10101f6
- field public static final int nestedScrollingEnabled = 16843832; // 0x1010438
+ field public static final int nestedScrollingEnabled = 16843830; // 0x1010436
field public static final int nextFocusDown = 16842980; // 0x10100e4
field public static final int nextFocusForward = 16843580; // 0x101033c
field public static final int nextFocusLeft = 16842977; // 0x10100e1
@@ -918,9 +915,9 @@
field public static final int notificationTimeout = 16843651; // 0x1010383
field public static final int numColumns = 16843032; // 0x1010118
field public static final int numStars = 16843076; // 0x1010144
- field public static final int numbersBackgroundColor = 16843941; // 0x10104a5
- field public static final int numbersSelectorColor = 16843942; // 0x10104a6
- field public static final int numbersTextColor = 16843940; // 0x10104a4
+ field public static final int numbersBackgroundColor = 16843939; // 0x10104a3
+ field public static final int numbersSelectorColor = 16843940; // 0x10104a4
+ field public static final int numbersTextColor = 16843938; // 0x10104a2
field public static final deprecated int numeric = 16843109; // 0x1010165
field public static final int numericShortcut = 16843236; // 0x10101e4
field public static final int onClick = 16843375; // 0x101026f
@@ -932,17 +929,18 @@
field public static final int orderingFromXml = 16843239; // 0x10101e7
field public static final int orientation = 16842948; // 0x10100c4
field public static final int outAnimation = 16843128; // 0x1010178
+ field public static final int outlineProvider = 16843961; // 0x10104b9
field public static final int overScrollFooter = 16843459; // 0x10102c3
field public static final int overScrollHeader = 16843458; // 0x10102c2
field public static final int overScrollMode = 16843457; // 0x10102c1
- field public static final int overlapAnchor = 16843876; // 0x1010464
+ field public static final int overlapAnchor = 16843874; // 0x1010462
field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2
field public static final int packageNames = 16843649; // 0x1010381
field public static final int padding = 16842965; // 0x10100d5
field public static final int paddingBottom = 16842969; // 0x10100d9
field public static final int paddingEnd = 16843700; // 0x10103b4
field public static final int paddingLeft = 16842966; // 0x10100d6
- field public static final int paddingMode = 16843865; // 0x1010459
+ field public static final int paddingMode = 16843863; // 0x1010457
field public static final int paddingRight = 16842968; // 0x10100d8
field public static final int paddingStart = 16843699; // 0x10103b3
field public static final int paddingTop = 16842967; // 0x10100d7
@@ -954,14 +952,14 @@
field public static final int parentActivityName = 16843687; // 0x10103a7
field public static final deprecated int password = 16843100; // 0x101015c
field public static final int path = 16842794; // 0x101002a
- field public static final int pathData = 16843808; // 0x1010420
+ field public static final int pathData = 16843807; // 0x101041f
field public static final int pathPattern = 16842796; // 0x101002c
field public static final int pathPrefix = 16842795; // 0x101002b
field public static final int permission = 16842758; // 0x1010006
field public static final int permissionFlags = 16843719; // 0x10103c7
field public static final int permissionGroup = 16842762; // 0x101000a
field public static final int permissionGroupFlags = 16843717; // 0x10103c5
- field public static final int persistableMode = 16843823; // 0x101042f
+ field public static final int persistableMode = 16843821; // 0x101042d
field public static final int persistent = 16842765; // 0x101000d
field public static final int persistentDrawingCache = 16842990; // 0x10100ee
field public static final deprecated int phoneNumber = 16843111; // 0x1010167
@@ -970,11 +968,11 @@
field public static final int popupAnimationStyle = 16843465; // 0x10102c9
field public static final int popupBackground = 16843126; // 0x1010176
field public static final int popupCharacters = 16843332; // 0x1010244
- field public static final int popupElevation = 16843918; // 0x101048e
+ field public static final int popupElevation = 16843916; // 0x101048c
field public static final int popupKeyboard = 16843331; // 0x1010243
field public static final int popupLayout = 16843323; // 0x101023b
field public static final int popupMenuStyle = 16843520; // 0x1010300
- field public static final int popupTheme = 16843948; // 0x10104ac
+ field public static final int popupTheme = 16843946; // 0x10104aa
field public static final int popupWindowStyle = 16842870; // 0x1010076
field public static final int port = 16842793; // 0x1010029
field public static final int positiveButtonText = 16843253; // 0x10101f5
@@ -989,8 +987,8 @@
field public static final int privateImeOptions = 16843299; // 0x1010223
field public static final int process = 16842769; // 0x1010011
field public static final int progress = 16843063; // 0x1010137
- field public static final int progressBackgroundTint = 16843879; // 0x1010467
- field public static final int progressBackgroundTintMode = 16843880; // 0x1010468
+ field public static final int progressBackgroundTint = 16843877; // 0x1010465
+ field public static final int progressBackgroundTintMode = 16843878; // 0x1010466
field public static final int progressBarPadding = 16843545; // 0x1010319
field public static final int progressBarStyle = 16842871; // 0x1010077
field public static final int progressBarStyleHorizontal = 16842872; // 0x1010078
@@ -1001,17 +999,17 @@
field public static final int progressBarStyleSmallInverse = 16843400; // 0x1010288
field public static final int progressBarStyleSmallTitle = 16843279; // 0x101020f
field public static final int progressDrawable = 16843068; // 0x101013c
- field public static final int progressTint = 16843877; // 0x1010465
- field public static final int progressTintMode = 16843878; // 0x1010466
+ field public static final int progressTint = 16843875; // 0x1010463
+ field public static final int progressTintMode = 16843876; // 0x1010464
field public static final int prompt = 16843131; // 0x101017b
field public static final int propertyName = 16843489; // 0x10102e1
- field public static final int propertyXName = 16843894; // 0x1010476
- field public static final int propertyYName = 16843895; // 0x1010477
+ field public static final int propertyXName = 16843892; // 0x1010474
+ field public static final int propertyYName = 16843893; // 0x1010475
field public static final int protectionLevel = 16842761; // 0x1010009
field public static final int publicKey = 16843686; // 0x10103a6
field public static final int queryActionMsg = 16843227; // 0x10101db
field public static final int queryAfterZeroResults = 16843394; // 0x1010282
- field public static final int queryBackground = 16843913; // 0x1010489
+ field public static final int queryBackground = 16843911; // 0x1010487
field public static final int queryHint = 16843608; // 0x1010358
field public static final int quickContactBadgeStyleSmallWindowLarge = 16843443; // 0x10102b3
field public static final int quickContactBadgeStyleSmallWindowMedium = 16843442; // 0x10102b2
@@ -1026,8 +1024,8 @@
field public static final int ratingBarStyleIndicator = 16843280; // 0x1010210
field public static final int ratingBarStyleSmall = 16842877; // 0x101007d
field public static final int readPermission = 16842759; // 0x1010007
- field public static final int recognitionService = 16843934; // 0x101049e
- field public static final int relinquishTaskIdentity = 16843896; // 0x1010478
+ field public static final int recognitionService = 16843932; // 0x101049c
+ field public static final int relinquishTaskIdentity = 16843894; // 0x1010476
field public static final int repeatCount = 16843199; // 0x10101bf
field public static final int repeatMode = 16843200; // 0x10101c0
field public static final int reqFiveWayNav = 16843314; // 0x1010232
@@ -1039,7 +1037,6 @@
field public static final int required = 16843406; // 0x101028e
field public static final int requiredAccountType = 16843734; // 0x10103d6
field public static final int requiredForAllUsers = 16843728; // 0x10103d0
- field public static final int requiredForProfile = 16843818; // 0x101042a
field public static final int requiresFadingEdge = 16843685; // 0x10103a5
field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
field public static final int resizeMode = 16843619; // 0x1010363
@@ -1048,8 +1045,8 @@
field public static final int restoreAnyVersion = 16843450; // 0x10102ba
field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
field public static final int restrictedAccountType = 16843733; // 0x10103d5
- field public static final int restrictionType = 16843925; // 0x1010495
- field public static final int reversible = 16843853; // 0x101044d
+ field public static final int restrictionType = 16843923; // 0x1010493
+ field public static final int reversible = 16843851; // 0x101044b
field public static final int right = 16843183; // 0x10101af
field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
field public static final int ringtoneType = 16843257; // 0x10101f9
@@ -1089,7 +1086,7 @@
field public static final int scrollbars = 16842974; // 0x10100de
field public static final int scrollingCache = 16843006; // 0x10100fe
field public static final deprecated int searchButtonText = 16843269; // 0x1010205
- field public static final int searchIcon = 16843909; // 0x1010485
+ field public static final int searchIcon = 16843907; // 0x1010483
field public static final int searchMode = 16843221; // 0x10101d5
field public static final int searchSettingsDescription = 16843402; // 0x101028a
field public static final int searchSuggestAuthority = 16843222; // 0x10101d6
@@ -1098,19 +1095,19 @@
field public static final int searchSuggestPath = 16843223; // 0x10101d7
field public static final int searchSuggestSelection = 16843224; // 0x10101d8
field public static final int searchSuggestThreshold = 16843373; // 0x101026d
- field public static final int searchViewStyle = 16843906; // 0x1010482
+ field public static final int searchViewStyle = 16843904; // 0x1010480
field public static final int secondaryProgress = 16843064; // 0x1010138
- field public static final int secondaryProgressTint = 16843881; // 0x1010469
- field public static final int secondaryProgressTintMode = 16843882; // 0x101046a
+ field public static final int secondaryProgressTint = 16843879; // 0x1010467
+ field public static final int secondaryProgressTintMode = 16843880; // 0x1010468
field public static final int seekBarStyle = 16842875; // 0x101007b
field public static final int segmentedButtonStyle = 16843568; // 0x1010330
field public static final int selectAllOnFocus = 16843102; // 0x101015e
field public static final int selectable = 16843238; // 0x10101e6
field public static final int selectableItemBackground = 16843534; // 0x101030e
- field public static final int selectableItemBackgroundBorderless = 16843870; // 0x101045e
+ field public static final int selectableItemBackgroundBorderless = 16843868; // 0x101045c
field public static final int selectedDateVerticalBar = 16843591; // 0x1010347
field public static final int selectedWeekBackgroundColor = 16843586; // 0x1010342
- field public static final int sessionService = 16843839; // 0x101043f
+ field public static final int sessionService = 16843837; // 0x101043d
field public static final int settingsActivity = 16843301; // 0x1010225
field public static final int setupActivity = 16843766; // 0x10103f6
field public static final int shadowColor = 16843105; // 0x1010161
@@ -1127,13 +1124,13 @@
field public static final int showDividers = 16843561; // 0x1010329
field public static final int showOnLockScreen = 16843721; // 0x10103c9
field public static final int showSilent = 16843259; // 0x10101fb
- field public static final int showText = 16843952; // 0x10104b0
+ field public static final int showText = 16843950; // 0x10104ae
field public static final int showWeekNumber = 16843582; // 0x101033e
field public static final int shownWeekCount = 16843585; // 0x1010341
field public static final int shrinkColumns = 16843082; // 0x101014a
field public static final deprecated int singleLine = 16843101; // 0x101015d
field public static final int singleUser = 16843711; // 0x10103bf
- field public static final int slideEdge = 16843826; // 0x1010432
+ field public static final int slideEdge = 16843824; // 0x1010430
field public static final int smallIcon = 16843422; // 0x101029e
field public static final int smallScreens = 16843396; // 0x1010284
field public static final int smoothScrollbar = 16843313; // 0x1010231
@@ -1145,19 +1142,19 @@
field public static final int spinnerStyle = 16842881; // 0x1010081
field public static final int spinnersShown = 16843595; // 0x101034b
field public static final int splitMotionEvents = 16843503; // 0x10102ef
- field public static final int splitTrack = 16843854; // 0x101044e
+ field public static final int splitTrack = 16843852; // 0x101044c
field public static final int src = 16843033; // 0x1010119
field public static final int ssp = 16843747; // 0x10103e3
field public static final int sspPattern = 16843749; // 0x10103e5
field public static final int sspPrefix = 16843748; // 0x10103e4
field public static final int stackFromBottom = 16843005; // 0x10100fd
- field public static final int stackViewStyle = 16843840; // 0x1010440
+ field public static final int stackViewStyle = 16843838; // 0x101043e
field public static final int starStyle = 16842882; // 0x1010082
field public static final int startColor = 16843165; // 0x101019d
field public static final int startDelay = 16843746; // 0x10103e2
field public static final int startOffset = 16843198; // 0x10101be
field public static final deprecated int startYear = 16843132; // 0x101017c
- field public static final int stateListAnimator = 16843850; // 0x101044a
+ field public static final int stateListAnimator = 16843848; // 0x1010448
field public static final int stateNotNeeded = 16842774; // 0x1010016
field public static final int state_above_anchor = 16842922; // 0x10100aa
field public static final int state_accelerated = 16843547; // 0x101031b
@@ -1182,27 +1179,27 @@
field public static final int state_single = 16842915; // 0x10100a3
field public static final int state_window_focused = 16842909; // 0x101009d
field public static final int staticWallpaperPreview = 16843569; // 0x1010331
- field public static final int statusBarColor = 16843859; // 0x1010453
+ field public static final int statusBarColor = 16843857; // 0x1010451
field public static final int stepSize = 16843078; // 0x1010146
field public static final int stopWithTask = 16843626; // 0x101036a
field public static final int streamType = 16843273; // 0x1010209
field public static final int stretchColumns = 16843081; // 0x1010149
field public static final int stretchMode = 16843030; // 0x1010116
- field public static final int strokeColor = 16843809; // 0x1010421
- field public static final int strokeLineCap = 16843815; // 0x1010427
- field public static final int strokeLineJoin = 16843816; // 0x1010428
- field public static final int strokeMiterLimit = 16843817; // 0x1010429
- field public static final int strokeWidth = 16843811; // 0x1010423
- field public static final int submitBackground = 16843914; // 0x101048a
+ field public static final int strokeColor = 16843808; // 0x1010420
+ field public static final int strokeLineCap = 16843813; // 0x1010425
+ field public static final int strokeLineJoin = 16843814; // 0x1010426
+ field public static final int strokeMiterLimit = 16843815; // 0x1010427
+ field public static final int strokeWidth = 16843809; // 0x1010421
+ field public static final int submitBackground = 16843912; // 0x1010488
field public static final int subtitle = 16843473; // 0x10102d1
- field public static final int subtitleTextAppearance = 16843825; // 0x1010431
+ field public static final int subtitleTextAppearance = 16843823; // 0x101042f
field public static final int subtitleTextStyle = 16843513; // 0x10102f9
field public static final int subtypeExtraValue = 16843674; // 0x101039a
field public static final int subtypeId = 16843713; // 0x10103c1
field public static final int subtypeLocale = 16843673; // 0x1010399
field public static final int suggestActionMsg = 16843228; // 0x10101dc
field public static final int suggestActionMsgColumn = 16843229; // 0x10101dd
- field public static final int suggestionRowLayout = 16843912; // 0x1010488
+ field public static final int suggestionRowLayout = 16843910; // 0x1010486
field public static final int summary = 16843241; // 0x10101e9
field public static final int summaryColumn = 16843426; // 0x10102a2
field public static final int summaryOff = 16843248; // 0x10101f0
@@ -1213,7 +1210,7 @@
field public static final int switchMinWidth = 16843632; // 0x1010370
field public static final int switchPadding = 16843633; // 0x1010371
field public static final int switchPreferenceStyle = 16843629; // 0x101036d
- field public static final int switchStyle = 16843841; // 0x1010441
+ field public static final int switchStyle = 16843839; // 0x101043f
field public static final int switchTextAppearance = 16843630; // 0x101036e
field public static final int switchTextOff = 16843628; // 0x101036c
field public static final int switchTextOn = 16843627; // 0x101036b
@@ -1227,7 +1224,7 @@
field public static final int targetClass = 16842799; // 0x101002f
field public static final int targetDescriptions = 16843680; // 0x10103a0
field public static final int targetId = 16843740; // 0x10103dc
- field public static final int targetName = 16843855; // 0x101044f
+ field public static final int targetName = 16843853; // 0x101044d
field public static final int targetPackage = 16842785; // 0x1010021
field public static final int targetSdkVersion = 16843376; // 0x1010270
field public static final int taskAffinity = 16842770; // 0x1010012
@@ -1251,7 +1248,7 @@
field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043
field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301
field public static final int textAppearanceListItem = 16843678; // 0x101039e
- field public static final int textAppearanceListItemSecondary = 16843828; // 0x1010434
+ field public static final int textAppearanceListItemSecondary = 16843826; // 0x1010432
field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f
field public static final int textAppearanceMedium = 16842817; // 0x1010041
field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044
@@ -1308,38 +1305,38 @@
field public static final int thumb = 16843074; // 0x1010142
field public static final int thumbOffset = 16843075; // 0x1010143
field public static final int thumbTextPadding = 16843634; // 0x1010372
- field public static final int thumbTint = 16843891; // 0x1010473
- field public static final int thumbTintMode = 16843892; // 0x1010474
+ field public static final int thumbTint = 16843889; // 0x1010471
+ field public static final int thumbTintMode = 16843890; // 0x1010472
field public static final int thumbnail = 16843429; // 0x10102a5
field public static final int tileMode = 16843265; // 0x1010201
- field public static final int tileModeX = 16843897; // 0x1010479
- field public static final int tileModeY = 16843898; // 0x101047a
- field public static final int timePickerDialogTheme = 16843936; // 0x10104a0
- field public static final int timePickerMode = 16843959; // 0x10104b7
- field public static final int timePickerStyle = 16843935; // 0x101049f
+ field public static final int tileModeX = 16843895; // 0x1010477
+ field public static final int tileModeY = 16843896; // 0x1010478
+ field public static final int timePickerDialogTheme = 16843934; // 0x101049e
+ field public static final int timePickerMode = 16843957; // 0x10104b5
+ field public static final int timePickerStyle = 16843933; // 0x101049d
field public static final int timeZone = 16843724; // 0x10103cc
field public static final int tint = 16843041; // 0x1010121
field public static final int tintMode = 16843797; // 0x1010415
field public static final int title = 16843233; // 0x10101e1
field public static final int titleCondensed = 16843234; // 0x10101e2
- field public static final int titleTextAppearance = 16843824; // 0x1010430
+ field public static final int titleTextAppearance = 16843822; // 0x101042e
field public static final int titleTextStyle = 16843512; // 0x10102f8
field public static final int toAlpha = 16843211; // 0x10101cb
field public static final int toDegrees = 16843188; // 0x10101b4
- field public static final int toId = 16843851; // 0x101044b
+ field public static final int toId = 16843849; // 0x1010449
field public static final int toScene = 16843742; // 0x10103de
field public static final int toXDelta = 16843207; // 0x10101c7
field public static final int toXScale = 16843203; // 0x10101c3
field public static final int toYDelta = 16843209; // 0x10101c9
field public static final int toYScale = 16843205; // 0x10101c5
- field public static final int toolbarStyle = 16843949; // 0x10104ad
+ field public static final int toolbarStyle = 16843947; // 0x10104ab
field public static final int top = 16843182; // 0x10101ae
field public static final int topBright = 16842955; // 0x10100cb
field public static final int topDark = 16842951; // 0x10100c7
field public static final int topLeftRadius = 16843177; // 0x10101a9
field public static final int topOffset = 16843352; // 0x1010258
field public static final int topRightRadius = 16843178; // 0x10101aa
- field public static final int touchscreenBlocksFocus = 16843921; // 0x1010491
+ field public static final int touchscreenBlocksFocus = 16843919; // 0x101048f
field public static final int track = 16843631; // 0x101036f
field public static final int transcriptMode = 16843008; // 0x1010100
field public static final int transformPivotX = 16843552; // 0x1010320
@@ -1348,14 +1345,15 @@
field public static final int transitionGroup = 16843803; // 0x101041b
field public static final int transitionName = 16843802; // 0x101041a
field public static final int transitionOrdering = 16843744; // 0x10103e0
- field public static final int translateX = 16843868; // 0x101045c
- field public static final int translateY = 16843869; // 0x101045d
+ field public static final int translateX = 16843866; // 0x101045a
+ field public static final int translateY = 16843867; // 0x101045b
field public static final int translationX = 16843554; // 0x1010322
field public static final int translationY = 16843555; // 0x1010323
field public static final int translationZ = 16843796; // 0x1010414
- field public static final int trimPathEnd = 16843813; // 0x1010425
- field public static final int trimPathOffset = 16843814; // 0x1010426
- field public static final int trimPathStart = 16843812; // 0x1010424
+ field public static final int trimPathEnd = 16843811; // 0x1010423
+ field public static final int trimPathOffset = 16843812; // 0x1010424
+ field public static final int trimPathStart = 16843810; // 0x1010422
+ field public static final int tvContentRatingDescription = 16843955; // 0x10104b3
field public static final int type = 16843169; // 0x10101a1
field public static final int typeface = 16842902; // 0x1010096
field public static final int uiOptions = 16843672; // 0x1010398
@@ -1383,10 +1381,10 @@
field public static final int viewportHeight = 16843805; // 0x101041d
field public static final int viewportWidth = 16843804; // 0x101041c
field public static final int visibility = 16842972; // 0x10100dc
- field public static final int visibilityMode = 16843902; // 0x101047e
+ field public static final int visibilityMode = 16843900; // 0x101047c
field public static final int visible = 16843156; // 0x1010194
field public static final int vmSafeMode = 16843448; // 0x10102b8
- field public static final int voiceIcon = 16843910; // 0x1010486
+ field public static final int voiceIcon = 16843908; // 0x1010484
field public static final int voiceLanguage = 16843349; // 0x1010255
field public static final int voiceLanguageModel = 16843347; // 0x1010253
field public static final int voiceMaxResults = 16843350; // 0x1010256
@@ -1412,23 +1410,23 @@
field public static final int windowActionBar = 16843469; // 0x10102cd
field public static final int windowActionBarOverlay = 16843492; // 0x10102e4
field public static final int windowActionModeOverlay = 16843485; // 0x10102dd
- field public static final int windowAllowEnterTransitionOverlap = 16843838; // 0x101043e
- field public static final int windowAllowExitTransitionOverlap = 16843837; // 0x101043d
+ field public static final int windowAllowEnterTransitionOverlap = 16843836; // 0x101043c
+ field public static final int windowAllowExitTransitionOverlap = 16843835; // 0x101043b
field public static final int windowAnimationStyle = 16842926; // 0x10100ae
field public static final int windowBackground = 16842836; // 0x1010054
- field public static final int windowClipToOutline = 16843950; // 0x10104ae
+ field public static final int windowClipToOutline = 16843948; // 0x10104ac
field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b
field public static final int windowContentOverlay = 16842841; // 0x1010059
field public static final int windowContentTransitionManager = 16843795; // 0x1010413
field public static final int windowContentTransitions = 16843794; // 0x1010412
field public static final int windowDisablePreview = 16843298; // 0x1010222
- field public static final int windowDrawsSystemBarBackgrounds = 16843858; // 0x1010452
- field public static final int windowElevation = 16843922; // 0x1010492
+ field public static final int windowDrawsSystemBarBackgrounds = 16843856; // 0x1010450
+ field public static final int windowElevation = 16843920; // 0x1010490
field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
field public static final int windowEnterAnimation = 16842932; // 0x10100b4
- field public static final int windowEnterTransition = 16843833; // 0x1010439
+ field public static final int windowEnterTransition = 16843831; // 0x1010437
field public static final int windowExitAnimation = 16842933; // 0x10100b5
- field public static final int windowExitTransition = 16843834; // 0x101043a
+ field public static final int windowExitTransition = 16843832; // 0x1010438
field public static final int windowFrame = 16842837; // 0x1010055
field public static final int windowFullscreen = 16843277; // 0x101020d
field public static final int windowHideAnimation = 16842935; // 0x10100b7
@@ -1439,12 +1437,12 @@
field public static final int windowNoDisplay = 16843294; // 0x101021e
field public static final int windowNoTitle = 16842838; // 0x1010056
field public static final int windowOverscan = 16843727; // 0x10103cf
- field public static final int windowReenterTransition = 16843954; // 0x10104b2
- field public static final int windowReturnTransition = 16843953; // 0x10104b1
- field public static final int windowSharedElementEnterTransition = 16843835; // 0x101043b
- field public static final int windowSharedElementExitTransition = 16843836; // 0x101043c
- field public static final int windowSharedElementReenterTransition = 16843956; // 0x10104b4
- field public static final int windowSharedElementReturnTransition = 16843955; // 0x10104b3
+ field public static final int windowReenterTransition = 16843952; // 0x10104b0
+ field public static final int windowReturnTransition = 16843951; // 0x10104af
+ field public static final int windowSharedElementEnterTransition = 16843833; // 0x1010439
+ field public static final int windowSharedElementExitTransition = 16843834; // 0x101043a
+ field public static final int windowSharedElementReenterTransition = 16843954; // 0x10104b2
+ field public static final int windowSharedElementReturnTransition = 16843953; // 0x10104b1
field public static final int windowShowAnimation = 16842934; // 0x10100b6
field public static final int windowShowWallpaper = 16843410; // 0x1010292
field public static final int windowSoftInputMode = 16843307; // 0x101022b
@@ -1452,15 +1450,15 @@
field public static final int windowTitleBackgroundStyle = 16842844; // 0x101005c
field public static final int windowTitleSize = 16842842; // 0x101005a
field public static final int windowTitleStyle = 16842843; // 0x101005b
- field public static final int windowTransitionBackgroundFadeDuration = 16843875; // 0x1010463
+ field public static final int windowTransitionBackgroundFadeDuration = 16843873; // 0x1010461
field public static final int windowTranslucentNavigation = 16843760; // 0x10103f0
field public static final int windowTranslucentStatus = 16843759; // 0x10103ef
field public static final int writePermission = 16842760; // 0x1010008
field public static final int x = 16842924; // 0x10100ac
field public static final int xlargeScreens = 16843455; // 0x10102bf
field public static final int y = 16842925; // 0x10100ad
- field public static final int yearListItemTextAppearance = 16843931; // 0x101049b
- field public static final int yearListSelectorColor = 16843932; // 0x101049c
+ field public static final int yearListItemTextAppearance = 16843929; // 0x1010499
+ field public static final int yearListSelectorColor = 16843930; // 0x101049a
field public static final int yesNoPreferenceStyle = 16842896; // 0x1010090
field public static final int zAdjustment = 16843201; // 0x10101c1
}
@@ -2049,6 +2047,8 @@
field public static final int TextAppearance_Material_Widget_TextView = 16974381; // 0x103022d
field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974382; // 0x103022e
field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974383; // 0x103022f
+ field public static final int TextAppearance_Material_Widget_Toolbar_Subtitle = 16974569; // 0x10302e9
+ field public static final int TextAppearance_Material_Widget_Toolbar_Title = 16974568; // 0x10302e8
field public static final int TextAppearance_Material_WindowTitle = 16974361; // 0x1030219
field public static final int TextAppearance_Medium = 16973892; // 0x1030044
field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045
@@ -2559,6 +2559,7 @@
field public static final int Widget_Material_Light_SeekBar = 16974534; // 0x10302c6
field public static final int Widget_Material_Light_SegmentedButton = 16974535; // 0x10302c7
field public static final int Widget_Material_Light_Spinner = 16974537; // 0x10302c9
+ field public static final int Widget_Material_Light_Spinner_Form = 16974567; // 0x10302e7
field public static final int Widget_Material_Light_StackView = 16974536; // 0x10302c8
field public static final int Widget_Material_Light_Tab = 16974538; // 0x10302ca
field public static final int Widget_Material_Light_TabWidget = 16974539; // 0x10302cb
@@ -2585,6 +2586,7 @@
field public static final int Widget_Material_SeekBar = 16974471; // 0x1030287
field public static final int Widget_Material_SegmentedButton = 16974472; // 0x1030288
field public static final int Widget_Material_Spinner = 16974474; // 0x103028a
+ field public static final int Widget_Material_Spinner_Form = 16974566; // 0x10302e6
field public static final int Widget_Material_StackView = 16974473; // 0x1030289
field public static final int Widget_Material_Tab = 16974475; // 0x103028b
field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c
@@ -3438,7 +3440,6 @@
method public void onAttachFragment(android.app.Fragment);
method public void onAttachedToWindow();
method public void onBackPressed();
- method public void onBackgroundMediaPlayingChanged(boolean);
method protected void onChildTitleChanged(android.app.Activity, java.lang.CharSequence);
method public void onConfigurationChanged(android.content.res.Configuration);
method public void onContentChanged();
@@ -3495,13 +3496,13 @@
method public boolean onSearchRequested();
method protected void onStart();
method protected void onStop();
- method public void onStopMediaPlaying();
method protected void onTitleChanged(java.lang.CharSequence, int);
method public boolean onTouchEvent(android.view.MotionEvent);
method public boolean onTrackballEvent(android.view.MotionEvent);
method public void onTrimMemory(int);
method public void onUserInteraction();
method protected void onUserLeaveHint();
+ method public void onVisibleBehindCancelled();
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
method public void onWindowFocusChanged(boolean);
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
@@ -3513,6 +3514,7 @@
method public void registerForContextMenu(android.view.View);
method public final deprecated void removeDialog(int);
method public void reportFullyDrawn();
+ method public boolean requestVisibleBehind(boolean);
method public final boolean requestWindowFeature(int);
method public final void runOnUiThread(java.lang.Runnable);
method public void setActionBar(android.widget.Toolbar);
@@ -3531,7 +3533,6 @@
method public void setImmersive(boolean);
method public void setIntent(android.content.Intent);
method public final void setMediaController(android.media.session.MediaController);
- method public boolean setMediaPlaying(boolean);
method public final void setProgress(int);
method public final void setProgressBarIndeterminate(boolean);
method public final void setProgressBarIndeterminateVisibility(boolean);
@@ -3772,20 +3773,11 @@
method public void update(android.app.ActivityOptions);
}
- public class AlarmClockInfo implements android.os.Parcelable {
- ctor public AlarmClockInfo(long, android.app.PendingIntent);
- method public int describeContents();
- method public android.app.PendingIntent getShowIntent();
- method public long getTriggerTime();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
public class AlarmManager {
method public void cancel(android.app.PendingIntent);
- method public android.app.AlarmClockInfo getNextAlarmClock();
+ method public android.app.AlarmManager.AlarmClockInfo getNextAlarmClock();
method public void set(int, long, android.app.PendingIntent);
- method public void setAlarmClock(android.app.AlarmClockInfo, android.app.PendingIntent);
+ method public void setAlarmClock(android.app.AlarmManager.AlarmClockInfo, android.app.PendingIntent);
method public void setExact(int, long, android.app.PendingIntent);
method public void setInexactRepeating(int, long, long, android.app.PendingIntent);
method public void setRepeating(int, long, long, android.app.PendingIntent);
@@ -3804,6 +3796,15 @@
field public static final int RTC_WAKEUP = 0; // 0x0
}
+ public static final class AlarmManager.AlarmClockInfo implements android.os.Parcelable {
+ ctor public AlarmManager.AlarmClockInfo(long, android.app.PendingIntent);
+ method public int describeContents();
+ method public android.app.PendingIntent getShowIntent();
+ method public long getTriggerTime();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
+ }
+
public class AlertDialog extends android.app.Dialog implements android.content.DialogInterface {
ctor protected AlertDialog(android.content.Context);
ctor protected AlertDialog(android.content.Context, int);
@@ -4492,6 +4493,7 @@
public class KeyguardManager {
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
+ method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure();
@@ -5238,8 +5240,8 @@
field public static java.lang.String ACTION_EXIT_CAR_MODE;
field public static java.lang.String ACTION_EXIT_DESK_MODE;
field public static final int DISABLE_CAR_MODE_GO_HOME = 1; // 0x1
+ field public static final int ENABLE_CAR_MODE_ALLOW_SLEEP = 2; // 0x2
field public static final int ENABLE_CAR_MODE_GO_CAR_HOME = 1; // 0x1
- field public static final int ENABLE_CAR_MODE_NO_WAKE_LOCK = 2; // 0x2
field public static final int MODE_NIGHT_AUTO = 0; // 0x0
field public static final int MODE_NIGHT_NO = 1; // 0x1
field public static final int MODE_NIGHT_YES = 2; // 0x2
@@ -5369,7 +5371,8 @@
method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent);
method public void onDisabled(android.content.Context, android.content.Intent);
method public void onEnabled(android.content.Context, android.content.Intent);
- method public void onLockTaskModeChanged(android.content.Context, android.content.Intent, boolean, java.lang.String);
+ method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String);
+ method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
method public void onPasswordChanged(android.content.Context, android.content.Intent);
method public void onPasswordExpiring(android.content.Context, android.content.Intent);
method public void onPasswordFailed(android.content.Context, android.content.Intent);
@@ -5379,7 +5382,8 @@
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";
field public static final java.lang.String ACTION_DEVICE_ADMIN_ENABLED = "android.app.action.DEVICE_ADMIN_ENABLED";
- field public static final java.lang.String ACTION_LOCK_TASK_CHANGED = "android.app.action.ACTION_LOCK_TASK_CHANGED";
+ field public static final java.lang.String ACTION_LOCK_TASK_ENTERING = "android.app.action.ACTION_LOCK_TASK_ENTERING";
+ field public static final java.lang.String ACTION_LOCK_TASK_EXITING = "android.app.action.ACTION_LOCK_TASK_EXITING";
field public static final java.lang.String ACTION_PASSWORD_CHANGED = "android.app.action.ACTION_PASSWORD_CHANGED";
field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";
field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";
@@ -5387,7 +5391,6 @@
field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE";
field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
- field public static final java.lang.String EXTRA_LOCK_TASK_ENTERING = "android.app.extra.LOCK_TASK_ENTERING";
field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
}
@@ -5456,7 +5459,7 @@
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);
- method public void setLockTaskPackages(java.lang.String[]) throws java.lang.SecurityException;
+ method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;
method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -6752,12 +6755,6 @@
package android.content {
- public abstract class AbstractRestrictionsProvider extends android.content.BroadcastReceiver {
- ctor public AbstractRestrictionsProvider();
- method public void onReceive(android.content.Context, android.content.Intent);
- method public abstract void requestPermission(android.content.Context, java.lang.String, java.lang.String, java.lang.String, android.os.PersistableBundle);
- }
-
public abstract class AbstractThreadedSyncAdapter {
ctor public AbstractThreadedSyncAdapter(android.content.Context, boolean);
ctor public AbstractThreadedSyncAdapter(android.content.Context, boolean, boolean);
@@ -7682,7 +7679,6 @@
field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";
field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";
field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";
- field public static final java.lang.String ACTION_CONFIRM_DEVICE_CREDENTIAL = "android.intent.action.CONFIRM_DEVICE_CREDENTIAL";
field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT";
field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";
field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";
@@ -7826,7 +7822,6 @@
field public static final java.lang.String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";
field public static final java.lang.String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";
field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
- field public static final java.lang.String EXTRA_DETAILS = "android.intent.extra.DETAILS";
field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1
@@ -8529,6 +8524,15 @@
field public int reqTouchScreen;
}
+ public final class FeatureGroupInfo implements android.os.Parcelable {
+ ctor public FeatureGroupInfo();
+ ctor public FeatureGroupInfo(android.content.pm.FeatureGroupInfo);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
+ field public android.content.pm.FeatureInfo[] features;
+ }
+
public class FeatureInfo implements android.os.Parcelable {
ctor public FeatureInfo();
ctor public FeatureInfo(android.content.pm.FeatureInfo);
@@ -8543,36 +8547,6 @@
field public int reqGlEsVersion;
}
- public class InstallSessionInfo implements android.os.Parcelable {
- method public int describeContents();
- method public android.graphics.Bitmap getAppIcon();
- method public java.lang.CharSequence getAppLabel();
- method public java.lang.String getAppPackageName();
- method public android.content.Intent getDetailsIntent();
- method public java.lang.String getInstallerPackageName();
- method public float getProgress();
- method public int getSessionId();
- method public boolean isOpen();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public class InstallSessionParams implements android.os.Parcelable {
- ctor public InstallSessionParams(int);
- method public int describeContents();
- method public void setAppIcon(android.graphics.Bitmap);
- method public void setAppLabel(java.lang.CharSequence);
- method public void setAppPackageName(java.lang.String);
- method public void setInstallLocation(int);
- method public void setOriginatingUri(android.net.Uri);
- method public void setReferrerUri(android.net.Uri);
- method public void setSize(long);
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- field public static final int MODE_FULL_INSTALL = 1; // 0x1
- field public static final int MODE_INHERIT_EXISTING = 2; // 0x2
- }
-
public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
ctor public InstrumentationInfo();
ctor public InstrumentationInfo(android.content.pm.InstrumentationInfo);
@@ -8617,19 +8591,26 @@
}
public class LauncherApps {
+ method public void addCallback(android.content.pm.LauncherApps.Callback);
+ method public void addCallback(android.content.pm.LauncherApps.Callback, android.os.Handler);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback, android.os.Handler);
method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
+ method public boolean isActivityEnabled(android.content.ComponentName, android.os.UserHandle);
method public boolean isActivityEnabledForProfile(android.content.ComponentName, android.os.UserHandle);
+ method public boolean isPackageEnabled(java.lang.String, android.os.UserHandle);
method public boolean isPackageEnabledForProfile(java.lang.String, android.os.UserHandle);
+ method public void removeCallback(android.content.pm.LauncherApps.Callback);
method public void removeOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void showAppDetailsForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startActivityForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
}
- public static abstract class LauncherApps.OnAppsChangedCallback {
- ctor public LauncherApps.OnAppsChangedCallback();
+ public static abstract class LauncherApps.Callback {
+ ctor public LauncherApps.Callback();
method public abstract void onPackageAdded(java.lang.String, android.os.UserHandle);
method public abstract void onPackageChanged(java.lang.String, android.os.UserHandle);
method public abstract void onPackageRemoved(java.lang.String, android.os.UserHandle);
@@ -8637,6 +8618,10 @@
method public abstract void onPackagesUnavailable(java.lang.String[], android.os.UserHandle, boolean);
}
+ public static abstract class LauncherApps.OnAppsChangedCallback extends android.content.pm.LauncherApps.Callback {
+ ctor public LauncherApps.OnAppsChangedCallback();
+ }
+
public class PackageInfo implements android.os.Parcelable {
ctor public PackageInfo();
method public int describeContents();
@@ -8650,6 +8635,7 @@
field public android.content.pm.ActivityInfo[] activities;
field public android.content.pm.ApplicationInfo applicationInfo;
field public android.content.pm.ConfigurationInfo[] configPreferences;
+ field public android.content.pm.FeatureGroupInfo[] featureGroups;
field public long firstInstallTime;
field public int[] gids;
field public int installLocation;
@@ -8674,37 +8660,35 @@
public class PackageInstaller {
method public void addSessionCallback(android.content.pm.PackageInstaller.SessionCallback);
method public void addSessionCallback(android.content.pm.PackageInstaller.SessionCallback, android.os.Handler);
- method public int createSession(android.content.pm.InstallSessionParams) throws java.io.IOException;
- method public java.util.List<android.content.pm.InstallSessionInfo> getAllSessions();
- method public java.util.List<android.content.pm.InstallSessionInfo> getMySessions();
- method public android.content.pm.InstallSessionInfo getSessionInfo(int);
+ method public int createSession(android.content.pm.PackageInstaller.SessionParams) throws java.io.IOException;
+ method public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllSessions();
+ method public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();
+ method public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);
method public android.content.pm.PackageInstaller.Session openSession(int);
method public void removeSessionCallback(android.content.pm.PackageInstaller.SessionCallback);
- method public void uninstall(java.lang.String, android.content.pm.PackageInstaller.UninstallCallback);
+ method public void uninstall(java.lang.String, android.content.IntentSender);
field public static final java.lang.String ACTION_SESSION_DETAILS = "android.content.pm.action.SESSION_DETAILS";
- field public static final java.lang.String EXTRA_SESSION_ID = "android.content.pm.extra.SESSION_ID";
- }
-
- public static abstract class PackageInstaller.CommitCallback {
- ctor public PackageInstaller.CommitCallback();
- method public abstract void onFailure(int, java.lang.String, android.os.Bundle);
- method public abstract void onSuccess();
- method public abstract void onUserActionRequired(android.content.Intent);
field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.content.pm.extra.PACKAGE_NAME";
- field public static final int FAILURE_ABORTED = 5; // 0x5
- field public static final int FAILURE_CONFLICT = 2; // 0x2
- field public static final int FAILURE_INCOMPATIBLE = 4; // 0x4
- field public static final int FAILURE_INVALID = 1; // 0x1
- field public static final int FAILURE_STORAGE = 3; // 0x3
- field public static final int FAILURE_UNKNOWN = 0; // 0x0
+ field public static final java.lang.String EXTRA_SESSION_ID = "android.content.pm.extra.SESSION_ID";
+ field public static final java.lang.String EXTRA_STATUS = "android.content.pm.extra.STATUS";
+ field public static final java.lang.String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
+ field public static final int STATUS_FAILURE = 1; // 0x1
+ field public static final int STATUS_FAILURE_ABORTED = 3; // 0x3
+ field public static final int STATUS_FAILURE_BLOCKED = 2; // 0x2
+ field public static final int STATUS_FAILURE_CONFLICT = 5; // 0x5
+ field public static final int STATUS_FAILURE_INCOMPATIBLE = 7; // 0x7
+ field public static final int STATUS_FAILURE_INVALID = 4; // 0x4
+ field public static final int STATUS_FAILURE_STORAGE = 6; // 0x6
+ field public static final int STATUS_PENDING_USER_ACTION = -1; // 0xffffffff
+ field public static final int STATUS_SUCCESS = 0; // 0x0
}
public static class PackageInstaller.Session implements java.io.Closeable {
method public void abandon();
method public void close();
- method public void commit(android.content.pm.PackageInstaller.CommitCallback);
+ method public void commit(android.content.IntentSender);
method public void fsync(java.io.OutputStream) throws java.io.IOException;
- method public java.lang.String[] list();
+ method public java.lang.String[] getNames() throws java.io.IOException;
method public java.io.InputStream openRead(java.lang.String) throws java.io.IOException;
method public java.io.OutputStream openWrite(java.lang.String, long, long) throws java.io.IOException;
method public void setProgress(float);
@@ -8719,14 +8703,34 @@
method public abstract void onProgressChanged(int, float);
}
- public static abstract class PackageInstaller.UninstallCallback {
- ctor public PackageInstaller.UninstallCallback();
- method public abstract void onFailure(int, java.lang.String, android.os.Bundle);
- method public abstract void onSuccess();
- method public abstract void onUserActionRequired(android.content.Intent);
- field public static final int FAILURE_ABORTED = 2; // 0x2
- field public static final int FAILURE_BLOCKED = 1; // 0x1
- field public static final int FAILURE_UNKNOWN = 0; // 0x0
+ public static class PackageInstaller.SessionInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.graphics.Bitmap getAppIcon();
+ method public java.lang.CharSequence getAppLabel();
+ method public java.lang.String getAppPackageName();
+ method public android.content.Intent getDetailsIntent();
+ method public java.lang.String getInstallerPackageName();
+ method public float getProgress();
+ method public int getSessionId();
+ method public boolean isOpen();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
+ }
+
+ public static class PackageInstaller.SessionParams implements android.os.Parcelable {
+ ctor public PackageInstaller.SessionParams(int);
+ method public int describeContents();
+ method public void setAppIcon(android.graphics.Bitmap);
+ method public void setAppLabel(java.lang.CharSequence);
+ method public void setAppPackageName(java.lang.String);
+ method public void setInstallLocation(int);
+ method public void setOriginatingUri(android.net.Uri);
+ method public void setReferrerUri(android.net.Uri);
+ method public void setSize(long);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
+ field public static final int MODE_FULL_INSTALL = 1; // 0x1
+ field public static final int MODE_INHERIT_EXISTING = 2; // 0x2
}
public class PackageItemInfo {
@@ -11657,7 +11661,7 @@
public class AnimatedStateListDrawable extends android.graphics.drawable.StateListDrawable {
ctor public AnimatedStateListDrawable();
method public void addState(int[], android.graphics.drawable.Drawable, int);
- method public void addTransition(int, int, android.graphics.drawable.Drawable, boolean);
+ method public void addTransition(int, int, T, boolean);
}
public class AnimatedVectorDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable {
@@ -13307,85 +13311,6 @@
}
-package android.hardware.location {
-
- public final class GeofenceHardware {
- method public boolean addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback);
- method public int[] getMonitoringTypes();
- method public int getStatusOfMonitoringType(int);
- method public boolean pauseGeofence(int, int);
- method public boolean registerForMonitorStateChangeCallback(int, android.hardware.location.GeofenceHardwareMonitorCallback);
- method public boolean removeGeofence(int, int);
- method public boolean resumeGeofence(int, int, int);
- method public boolean unregisterForMonitorStateChangeCallback(int, android.hardware.location.GeofenceHardwareMonitorCallback);
- field public static final int GEOFENCE_ENTERED = 1; // 0x1
- field public static final int GEOFENCE_ERROR_ID_EXISTS = 2; // 0x2
- field public static final int GEOFENCE_ERROR_ID_UNKNOWN = 3; // 0x3
- field public static final int GEOFENCE_ERROR_INSUFFICIENT_MEMORY = 6; // 0x6
- field public static final int GEOFENCE_ERROR_INVALID_TRANSITION = 4; // 0x4
- field public static final int GEOFENCE_ERROR_TOO_MANY_GEOFENCES = 1; // 0x1
- field public static final int GEOFENCE_EXITED = 2; // 0x2
- field public static final int GEOFENCE_FAILURE = 5; // 0x5
- field public static final int GEOFENCE_SUCCESS = 0; // 0x0
- field public static final int GEOFENCE_UNCERTAIN = 4; // 0x4
- field public static final int MONITORING_TYPE_FUSED_HARDWARE = 1; // 0x1
- field public static final int MONITORING_TYPE_GPS_HARDWARE = 0; // 0x0
- field public static final int MONITOR_CURRENTLY_AVAILABLE = 0; // 0x0
- field public static final int MONITOR_CURRENTLY_UNAVAILABLE = 1; // 0x1
- field public static final int MONITOR_UNSUPPORTED = 2; // 0x2
- field public static final int SOURCE_TECHNOLOGY_BLUETOOTH = 16; // 0x10
- field public static final int SOURCE_TECHNOLOGY_CELL = 8; // 0x8
- field public static final int SOURCE_TECHNOLOGY_GNSS = 1; // 0x1
- field public static final int SOURCE_TECHNOLOGY_SENSORS = 4; // 0x4
- field public static final int SOURCE_TECHNOLOGY_WIFI = 2; // 0x2
- }
-
- public abstract class GeofenceHardwareCallback {
- ctor public GeofenceHardwareCallback();
- method public void onGeofenceAdd(int, int);
- method public void onGeofencePause(int, int);
- method public void onGeofenceRemove(int, int);
- method public void onGeofenceResume(int, int);
- method public void onGeofenceTransition(int, int, android.location.Location, long, int);
- }
-
- public abstract class GeofenceHardwareMonitorCallback {
- ctor public GeofenceHardwareMonitorCallback();
- method public deprecated void onMonitoringSystemChange(int, boolean, android.location.Location);
- method public void onMonitoringSystemChange(android.hardware.location.GeofenceHardwareMonitorEvent);
- }
-
- public class GeofenceHardwareMonitorEvent implements android.os.Parcelable {
- ctor public GeofenceHardwareMonitorEvent(int, int, int, android.location.Location);
- method public int describeContents();
- method public android.location.Location getLocation();
- method public int getMonitoringStatus();
- method public int getMonitoringType();
- method public int getSourceTechnologies();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public final class GeofenceHardwareRequest {
- ctor public GeofenceHardwareRequest();
- method public static android.hardware.location.GeofenceHardwareRequest createCircularGeofence(double, double, double);
- method public int getLastTransition();
- method public double getLatitude();
- method public double getLongitude();
- method public int getMonitorTransitions();
- method public int getNotificationResponsiveness();
- method public double getRadius();
- method public int getSourceTechnologies();
- method public int getUnknownTimer();
- method public void setLastTransition(int);
- method public void setMonitorTransitions(int);
- method public void setNotificationResponsiveness(int);
- method public void setSourceTechnologies(int);
- method public void setUnknownTimer(int);
- }
-
-}
-
package android.hardware.usb {
public class UsbAccessory implements android.os.Parcelable {
@@ -13588,7 +13513,7 @@
public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
ctor public InputMethodService();
- method public boolean enableHardwareAcceleration();
+ method public deprecated boolean enableHardwareAcceleration();
method public int getBackDisposition();
method public int getCandidatesHiddenVisibility();
method public android.view.inputmethod.InputBinding getCurrentInputBinding();
@@ -15762,11 +15687,12 @@
}
public class Ringtone {
- method public int getStreamType();
+ method public deprecated int getStreamType();
method public java.lang.String getTitle(android.content.Context);
method public boolean isPlaying();
method public void play();
- method public void setStreamType(int);
+ method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public deprecated void setStreamType(int);
method public void stop();
}
@@ -16431,7 +16357,6 @@
public final class MediaProjection {
method public void addCallback(android.media.projection.MediaProjection.Callback, android.os.Handler);
- method public android.media.AudioRecord createAudioRecord(int, int, int, int);
method public android.hardware.display.VirtualDisplay createVirtualDisplay(java.lang.String, int, int, int, int, android.view.Surface, android.hardware.display.VirtualDisplay.Callbacks, android.os.Handler);
method public void removeCallback(android.media.projection.MediaProjection.Callback);
method public void stop();
@@ -16449,242 +16374,6 @@
}
-package android.media.routing {
-
- public final class MediaRouteSelector implements android.os.Parcelable {
- method public boolean containsProtocol(java.lang.Class<?>);
- method public boolean containsProtocol(java.lang.String);
- method public int describeContents();
- method public android.os.Bundle getExtras();
- method public int getOptionalFeatures();
- method public java.util.List<java.lang.String> getOptionalProtocols();
- method public int getRequiredFeatures();
- method public java.util.List<java.lang.String> getRequiredProtocols();
- method public java.lang.String getServicePackageName();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public static final class MediaRouteSelector.Builder {
- ctor public MediaRouteSelector.Builder();
- method public android.media.routing.MediaRouteSelector.Builder addOptionalProtocol(java.lang.Class<?>);
- method public android.media.routing.MediaRouteSelector.Builder addOptionalProtocol(java.lang.String);
- method public android.media.routing.MediaRouteSelector.Builder addRequiredProtocol(java.lang.Class<?>);
- method public android.media.routing.MediaRouteSelector.Builder addRequiredProtocol(java.lang.String);
- method public android.media.routing.MediaRouteSelector build();
- method public android.media.routing.MediaRouteSelector.Builder setExtras(android.os.Bundle);
- method public android.media.routing.MediaRouteSelector.Builder setOptionalFeatures(int);
- method public android.media.routing.MediaRouteSelector.Builder setRequiredFeatures(int);
- method public android.media.routing.MediaRouteSelector.Builder setServicePackageName(java.lang.String);
- }
-
- public abstract class MediaRouteService extends android.app.Service {
- ctor public MediaRouteService();
- method public android.media.routing.MediaRouter.ServiceMetadata getServiceMetadata();
- method public android.os.IBinder onBind(android.content.Intent);
- method public abstract android.media.routing.MediaRouteService.ClientSession onCreateClientSession(android.media.routing.MediaRouteService.ClientInfo);
- field public static final java.lang.String SERVICE_INTERFACE = "android.media.routing.MediaRouteService";
- }
-
- public static final class MediaRouteService.ClientInfo {
- method public java.lang.String getPackageName();
- method public int getUid();
- }
-
- public static abstract class MediaRouteService.ClientSession {
- ctor public MediaRouteService.ClientSession();
- method public abstract boolean onConnect(android.media.routing.MediaRouter.ConnectionRequest, android.media.routing.MediaRouteService.ConnectionCallback);
- method public abstract void onDisconnect();
- method public void onPauseStream();
- method public void onRelease();
- method public void onResumeStream();
- method public abstract boolean onStartDiscovery(android.media.routing.MediaRouter.DiscoveryRequest, android.media.routing.MediaRouteService.DiscoveryCallback);
- method public abstract void onStopDiscovery();
- }
-
- public final class MediaRouteService.ConnectionCallback {
- method public void onConnected(android.media.routing.MediaRouter.ConnectionInfo);
- method public void onConnectionFailed(int, java.lang.CharSequence, android.os.Bundle);
- method public void onDisconnected();
- }
-
- public final class MediaRouteService.DiscoveryCallback {
- method public void onDestinationFound(android.media.routing.MediaRouter.DestinationInfo, java.util.List<android.media.routing.MediaRouter.RouteInfo>);
- method public void onDestinationLost(android.media.routing.MediaRouter.DestinationInfo);
- method public void onDiscoveryFailed(int, java.lang.CharSequence, android.os.Bundle);
- }
-
- public final class MediaRouter {
- ctor public MediaRouter(android.content.Context);
- method public void addSelector(android.media.routing.MediaRouteSelector);
- method public void clearSelectors();
- method public android.media.routing.MediaRouter.Delegate createDelegate();
- method public android.media.routing.MediaRouter.ConnectionInfo getConnection();
- method public int getConnectionState();
- method public java.util.List<android.media.routing.MediaRouter.DestinationInfo> getDiscoveredDestinations();
- method public java.util.List<android.media.routing.MediaRouter.RouteInfo> getDiscoveredRoutes(android.media.routing.MediaRouter.DestinationInfo);
- method public int getDiscoveryState();
- method public android.media.AudioAttributes getPreferredAudioAttributes();
- method public android.view.Display getPreferredPresentationDisplay();
- method public android.media.VolumeProvider getPreferredVolumeProvider();
- method public android.media.routing.MediaRouter.DestinationInfo getSelectedDestination();
- method public android.media.routing.MediaRouter.RouteInfo getSelectedRoute();
- method public java.util.List<android.media.routing.MediaRouteSelector> getSelectors();
- method public boolean isReleased();
- method public void pauseStream();
- method public void release();
- method public void removeSelector(android.media.routing.MediaRouteSelector);
- method public void resumeStream();
- method public void setRoutingCallback(android.media.routing.MediaRouter.RoutingCallback, android.os.Handler);
- field public static final int CONNECTION_ERROR_ABORTED = 1; // 0x1
- field public static final int CONNECTION_ERROR_BARGED = 7; // 0x7
- field public static final int CONNECTION_ERROR_BROKEN = 6; // 0x6
- field public static final int CONNECTION_ERROR_BUSY = 4; // 0x4
- field public static final int CONNECTION_ERROR_TIMEOUT = 5; // 0x5
- field public static final int CONNECTION_ERROR_UNAUTHORIZED = 2; // 0x2
- field public static final int CONNECTION_ERROR_UNKNOWN = 0; // 0x0
- field public static final int CONNECTION_ERROR_UNREACHABLE = 3; // 0x3
- field public static final int CONNECTION_FLAG_BARGE = 1; // 0x1
- field public static final int CONNECTION_STATE_CONNECTED = 2; // 0x2
- field public static final int CONNECTION_STATE_CONNECTING = 1; // 0x1
- field public static final int CONNECTION_STATE_DISCONNECTED = 0; // 0x0
- field public static final int DISCONNECTION_REASON_APPLICATION_REQUEST = 0; // 0x0
- field public static final int DISCONNECTION_REASON_ERROR = 2; // 0x2
- field public static final int DISCONNECTION_REASON_USER_REQUEST = 1; // 0x1
- field public static final int DISCOVERY_ERROR_ABORTED = 1; // 0x1
- field public static final int DISCOVERY_ERROR_NO_CONNECTIVITY = 2; // 0x2
- field public static final int DISCOVERY_ERROR_UNKNOWN = 0; // 0x0
- field public static final int DISCOVERY_FLAG_BACKGROUND = 1; // 0x1
- field public static final int DISCOVERY_STATE_STARTED = 1; // 0x1
- field public static final int DISCOVERY_STATE_STOPPED = 0; // 0x0
- field public static final int ROUTE_FEATURE_LIVE_AUDIO = 1; // 0x1
- field public static final int ROUTE_FEATURE_LIVE_VIDEO = 2; // 0x2
- }
-
- public static final class MediaRouter.ConnectionInfo {
- method public android.media.AudioAttributes getAudioAttributes();
- method public android.os.Bundle getExtras();
- method public int getFeatures();
- method public android.view.Display getPresentationDisplay();
- method public android.os.IBinder getProtocolBinder(java.lang.String);
- method public android.os.IBinder getProtocolBinder(int);
- method public T getProtocolObject(java.lang.Class<T>);
- method public java.util.List<java.lang.String> getProtocols();
- method public android.media.routing.MediaRouter.RouteInfo getRoute();
- method public android.media.VolumeProvider getVolumeProvider();
- }
-
- public static final class MediaRouter.ConnectionInfo.Builder {
- ctor public MediaRouter.ConnectionInfo.Builder(android.media.routing.MediaRouter.RouteInfo);
- method public android.media.routing.MediaRouter.ConnectionInfo build();
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setAudioAttributes(android.media.AudioAttributes);
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setExtras(android.os.Bundle);
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setPresentationDisplay(android.view.Display);
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setProtocolBinder(java.lang.String, android.os.IBinder);
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setProtocolStub(java.lang.Class<?>, android.os.IInterface);
- method public android.media.routing.MediaRouter.ConnectionInfo.Builder setVolumeProvider(android.media.VolumeProvider);
- }
-
- public static final class MediaRouter.ConnectionRequest {
- method public android.os.Bundle getExtras();
- method public int getFlags();
- method public android.media.routing.MediaRouter.RouteInfo getRoute();
- method public void setExtras(android.os.Bundle);
- method public void setFlags(int);
- method public void setRoute(android.media.routing.MediaRouter.RouteInfo);
- }
-
- public static final class MediaRouter.Delegate {
- ctor public MediaRouter.Delegate();
- method public void addStateCallback(android.media.routing.MediaRouter.StateCallback, android.os.Handler);
- method public void connect(android.media.routing.MediaRouter.DestinationInfo, int);
- method public void disconnect(int);
- method public int getConnectionState();
- method public java.util.List<android.media.routing.MediaRouter.DestinationInfo> getDiscoveredDestinations();
- method public int getDiscoveryState();
- method public android.media.routing.MediaRouter.DestinationInfo getSelectedDestination();
- method public boolean isReleased();
- method public void removeStateCallback(android.media.routing.MediaRouter.StateCallback);
- method public void startDiscovery(int);
- method public void stopDiscovery();
- }
-
- public static final class MediaRouter.DestinationInfo {
- method public java.lang.CharSequence getDescription();
- method public android.os.Bundle getExtras();
- method public int getIconResourceId();
- method public java.lang.String getId();
- method public java.lang.CharSequence getName();
- method public android.media.routing.MediaRouter.ServiceMetadata getServiceMetadata();
- method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
- }
-
- public static final class MediaRouter.DestinationInfo.Builder {
- ctor public MediaRouter.DestinationInfo.Builder(java.lang.String, android.media.routing.MediaRouter.ServiceMetadata, java.lang.CharSequence);
- method public android.media.routing.MediaRouter.DestinationInfo build();
- method public android.media.routing.MediaRouter.DestinationInfo.Builder setDescription(java.lang.CharSequence);
- method public android.media.routing.MediaRouter.DestinationInfo.Builder setExtras(android.os.Bundle);
- method public android.media.routing.MediaRouter.DestinationInfo.Builder setIconResourceId(int);
- }
-
- public static final class MediaRouter.DiscoveryRequest {
- method public int getFlags();
- method public java.util.List<android.media.routing.MediaRouteSelector> getSelectors();
- method public void setFlags(int);
- method public void setSelectors(java.util.List<android.media.routing.MediaRouteSelector>);
- }
-
- public static final class MediaRouter.RouteInfo {
- method public android.media.routing.MediaRouter.DestinationInfo getDestination();
- method public android.os.Bundle getExtras();
- method public int getFeatures();
- method public java.lang.String getId();
- method public java.util.List<java.lang.String> getProtocols();
- method public android.media.routing.MediaRouteSelector getSelector();
- }
-
- public static final class MediaRouter.RouteInfo.Builder {
- ctor public MediaRouter.RouteInfo.Builder(java.lang.String, android.media.routing.MediaRouter.DestinationInfo, android.media.routing.MediaRouteSelector);
- method public android.media.routing.MediaRouter.RouteInfo.Builder addProtocol(java.lang.Class<T>);
- method public android.media.routing.MediaRouter.RouteInfo.Builder addProtocol(java.lang.String);
- method public android.media.routing.MediaRouter.RouteInfo build();
- method public android.media.routing.MediaRouter.RouteInfo.Builder setExtras(android.os.Bundle);
- method public android.media.routing.MediaRouter.RouteInfo.Builder setFeatures(int);
- }
-
- public static abstract class MediaRouter.RoutingCallback extends android.media.routing.MediaRouter.StateCallback {
- ctor public MediaRouter.RoutingCallback();
- method public boolean onPrepareConnectionRequest(android.media.routing.MediaRouter.ConnectionRequest, android.media.routing.MediaRouter.DestinationInfo, java.util.List<android.media.routing.MediaRouter.RouteInfo>);
- method public boolean onPrepareDiscoveryRequest(android.media.routing.MediaRouter.DiscoveryRequest, java.util.List<android.media.routing.MediaRouteSelector>);
- }
-
- public static final class MediaRouter.ServiceMetadata {
- method public android.content.ComponentName getComponentName();
- method public android.graphics.drawable.Drawable getIcon(android.content.pm.PackageManager);
- method public java.lang.CharSequence getLabel(android.content.pm.PackageManager);
- method public java.lang.String getPackageName();
- method public android.content.pm.ServiceInfo getService();
- }
-
- public static abstract class MediaRouter.StateCallback {
- ctor public MediaRouter.StateCallback();
- method public void onConnected();
- method public void onConnecting();
- method public void onConnectionFailed(int, java.lang.CharSequence, android.os.Bundle);
- method public void onConnectionStateChanged(int);
- method public void onDestinationFound(android.media.routing.MediaRouter.DestinationInfo);
- method public void onDestinationLost(android.media.routing.MediaRouter.DestinationInfo);
- method public void onDisconnected();
- method public void onDiscoveryFailed(int, java.lang.CharSequence, android.os.Bundle);
- method public void onDiscoveryStarted();
- method public void onDiscoveryStateChanged(int);
- method public void onDiscoveryStopped();
- method public void onReleased();
- method public void onSelectedDestinationChanged(android.media.routing.MediaRouter.DestinationInfo);
- }
-
-}
-
package android.media.session {
public final class MediaController {
@@ -16692,20 +16381,19 @@
method public void addCallback(android.media.session.MediaController.Callback);
method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler);
method public void adjustVolume(int, int);
- method public android.media.routing.MediaRouter.Delegate createMediaRouterDelegate();
method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);
method public android.os.Bundle getExtras();
method public long getFlags();
- method public android.app.PendingIntent getLaunchActivity();
method public android.media.MediaMetadata getMetadata();
method public java.lang.String getPackageName();
+ method public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
method public android.media.session.PlaybackState getPlaybackState();
- method public java.util.List<android.media.session.MediaSession.Track> getQueue();
+ method public java.util.List<android.media.session.MediaSession.Item> getQueue();
method public java.lang.CharSequence getQueueTitle();
method public int getRatingType();
+ method public android.app.PendingIntent getSessionActivity();
method public android.media.session.MediaSession.Token getSessionToken();
method public android.media.session.MediaController.TransportControls getTransportControls();
- method public android.media.session.MediaController.VolumeInfo getVolumeInfo();
method public void removeCallback(android.media.session.MediaController.Callback);
method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
method public void setVolumeTo(int, int);
@@ -16713,13 +16401,24 @@
public static abstract class MediaController.Callback {
ctor public MediaController.Callback();
+ method public void onAudioInfoChanged(android.media.session.MediaController.PlaybackInfo);
method public void onExtrasChanged(android.os.Bundle);
method public void onMetadataChanged(android.media.MediaMetadata);
method public void onPlaybackStateChanged(android.media.session.PlaybackState);
- method public void onQueueChanged(java.util.List<android.media.session.MediaSession.Track>);
+ method public void onQueueChanged(java.util.List<android.media.session.MediaSession.Item>);
method public void onQueueTitleChanged(java.lang.CharSequence);
+ method public void onSessionDestroyed();
method public void onSessionEvent(java.lang.String, android.os.Bundle);
- method public void onVolumeInfoChanged(android.media.session.MediaController.VolumeInfo);
+ }
+
+ public static final class MediaController.PlaybackInfo {
+ method public android.media.AudioAttributes getAudioAttributes();
+ method public int getCurrentVolume();
+ method public int getMaxVolume();
+ method public int getPlaybackType();
+ method public int getVolumeControl();
+ field public static final int PLAYBACK_TYPE_LOCAL = 1; // 0x1
+ field public static final int PLAYBACK_TYPE_REMOTE = 2; // 0x2
}
public final class MediaController.TransportControls {
@@ -16733,20 +16432,12 @@
method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
method public void sendCustomAction(java.lang.String, android.os.Bundle);
method public void setRating(android.media.Rating);
+ method public void skipToItem(long);
method public void skipToNext();
method public void skipToPrevious();
- method public void skipToTrack(long);
method public void stop();
}
- public static final class MediaController.VolumeInfo {
- method public android.media.AudioAttributes getAudioAttributes();
- method public int getCurrentVolume();
- method public int getMaxVolume();
- method public int getVolumeControl();
- method public int getVolumeType();
- }
-
public final class MediaSession {
ctor public MediaSession(android.content.Context, java.lang.String);
method public android.media.session.MediaController getController();
@@ -16759,19 +16450,16 @@
method public void setCallback(android.media.session.MediaSession.Callback, android.os.Handler);
method public void setExtras(android.os.Bundle);
method public void setFlags(int);
- method public void setLaunchActivity(android.app.PendingIntent);
method public void setMediaButtonReceiver(android.app.PendingIntent);
- method public void setMediaRouter(android.media.routing.MediaRouter);
method public void setMetadata(android.media.MediaMetadata);
method public void setPlaybackState(android.media.session.PlaybackState);
method public void setPlaybackToLocal(android.media.AudioAttributes);
method public void setPlaybackToRemote(android.media.VolumeProvider);
- method public void setQueue(java.util.List<android.media.session.MediaSession.Track>);
+ method public void setQueue(java.util.List<android.media.session.MediaSession.Item>);
method public void setQueueTitle(java.lang.CharSequence);
+ 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_TRANSPORT_CONTROLS = 2; // 0x2
- field public static final int PLAYBACK_TYPE_LOCAL = 1; // 0x1
- field public static final int PLAYBACK_TYPE_REMOTE = 2; // 0x2
}
public static abstract class MediaSession.Callback {
@@ -16787,19 +16475,13 @@
method public void onRewind();
method public void onSeekTo(long);
method public void onSetRating(android.media.Rating);
+ method public void onSkipToItem(long);
method public void onSkipToNext();
method public void onSkipToPrevious();
- method public void onSkipToTrack(long);
method public void onStop();
}
- public static final class MediaSession.Token implements android.os.Parcelable {
- method public int describeContents();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public static final class MediaSession.Track implements android.os.Parcelable {
+ public static final class MediaSession.Item implements android.os.Parcelable {
method public int describeContents();
method public android.os.Bundle getExtras();
method public long getId();
@@ -16810,27 +16492,33 @@
field public static final int UNKNOWN_ID = -1; // 0xffffffff
}
- public static final class MediaSession.Track.Builder {
- ctor public MediaSession.Track.Builder(android.media.MediaMetadata, long, android.net.Uri);
- method public android.media.session.MediaSession.Track build();
- method public android.media.session.MediaSession.Track.Builder setExtras(android.os.Bundle);
+ public static final class MediaSession.Item.Builder {
+ ctor public MediaSession.Item.Builder(android.media.MediaMetadata, long, android.net.Uri);
+ method public android.media.session.MediaSession.Item build();
+ method public android.media.session.MediaSession.Item.Builder setExtras(android.os.Bundle);
+ }
+
+ public static final class MediaSession.Token implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
}
public final class MediaSessionManager {
- method public void addActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener, android.content.ComponentName);
+ method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName);
+ method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName, android.os.Handler);
method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName);
- method public void removeActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener);
+ method public void removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
}
- public static abstract class MediaSessionManager.SessionListener {
- ctor public MediaSessionManager.SessionListener(android.content.Context);
+ public static abstract interface MediaSessionManager.OnActiveSessionsChangedListener {
method public abstract void onActiveSessionsChanged(java.util.List<android.media.session.MediaController>);
}
public final class PlaybackState implements android.os.Parcelable {
method public int describeContents();
method public long getActions();
- method public long getBufferPosition();
+ method public long getBufferedPosition();
method public java.util.List<android.media.session.PlaybackState.CustomAction> getCustomActions();
method public java.lang.CharSequence getErrorMessage();
method public long getLastPositionUpdateTime();
@@ -16847,9 +16535,9 @@
field public static final long ACTION_REWIND = 8L; // 0x8L
field public static final long ACTION_SEEK_TO = 256L; // 0x100L
field public static final long ACTION_SET_RATING = 128L; // 0x80L
+ field public static final long ACTION_SKIP_TO_ITEM = 4096L; // 0x1000L
field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L
field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L
- field public static final long ACTION_SKIP_TO_TRACK = 4096L; // 0x1000L
field public static final long ACTION_STOP = 1L; // 0x1L
field public static final android.os.Parcelable.Creator CREATOR;
field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
@@ -16873,8 +16561,8 @@
method public android.media.session.PlaybackState.Builder addCustomAction(android.media.session.PlaybackState.CustomAction);
method public android.media.session.PlaybackState build();
method public android.media.session.PlaybackState.Builder setActions(long);
- method public android.media.session.PlaybackState.Builder setActiveTrack(long);
- method public android.media.session.PlaybackState.Builder setBufferPosition(long);
+ method public android.media.session.PlaybackState.Builder setActiveItem(long);
+ method public android.media.session.PlaybackState.Builder setBufferedPosition(long);
method public android.media.session.PlaybackState.Builder setErrorMessage(java.lang.CharSequence);
method public android.media.session.PlaybackState.Builder setState(int, long, float, long);
method public android.media.session.PlaybackState.Builder setState(int, long, float);
@@ -16914,7 +16602,7 @@
method public static final android.net.Uri buildChannelLogoUri(long);
method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);
method public static final android.net.Uri buildChannelUri(long);
- method public static final android.net.Uri buildChannelUriForPassthroughTvInput(java.lang.String);
+ method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);
method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);
method public static final java.lang.String buildInputId(android.content.ComponentName);
method public static final android.net.Uri buildProgramUri(long);
@@ -17046,7 +16734,7 @@
method public java.lang.String getParentId();
method public android.content.pm.ServiceInfo getServiceInfo();
method public int getType();
- method public boolean isPassthroughInputType();
+ method public boolean isPassthroughInput();
method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
method public java.lang.CharSequence loadLabel(android.content.Context);
method public void writeToParcel(android.os.Parcel, int);
@@ -17141,6 +16829,7 @@
method public final java.lang.String getId();
method public final java.lang.String getLanguage();
method public final int getType();
+ method public final float getVideoFrameRate();
method public final int getVideoHeight();
method public final int getVideoWidth();
method public void writeToParcel(android.os.Parcel, int);
@@ -17157,6 +16846,7 @@
method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);
method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);
method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String);
+ method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float);
method public final android.media.tv.TvTrackInfo.Builder setVideoHeight(int);
method public final android.media.tv.TvTrackInfo.Builder setVideoWidth(int);
}
@@ -17177,8 +16867,6 @@
method public void setStreamVolume(float);
method public void setTvInputListener(android.media.tv.TvView.TvInputListener);
method public void tune(java.lang.String, android.net.Uri);
- field public static final int ERROR_INPUT_DISCONNECTED = 1; // 0x1
- field public static final int ERROR_INPUT_NOT_CONNECTED = 0; // 0x0
}
public static abstract interface TvView.OnUnhandledInputEventListener {
@@ -17188,9 +16876,10 @@
public static abstract class TvView.TvInputListener {
ctor public TvView.TvInputListener();
method public void onChannelRetuned(java.lang.String, android.net.Uri);
+ method public void onConnectionFailed(java.lang.String);
method public void onContentAllowed(java.lang.String);
method public void onContentBlocked(java.lang.String, android.media.tv.TvContentRating);
- method public void onError(java.lang.String, int);
+ method public void onDisconnected(java.lang.String);
method public void onTrackSelected(java.lang.String, int, java.lang.String);
method public void onTracksChanged(java.lang.String, java.util.List<android.media.tv.TvTrackInfo>);
method public void onVideoAvailable(java.lang.String);
@@ -18776,25 +18465,8 @@
package android.net.wifi.passpoint {
public abstract interface IWifiPasspointManager implements android.os.IInterface {
- method public abstract boolean addCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- method public abstract java.util.List<android.net.wifi.passpoint.WifiPasspointCredential> getCredentials() throws android.os.RemoteException;
method public abstract android.os.Messenger getMessenger() throws android.os.RemoteException;
method public abstract int getPasspointState() throws android.os.RemoteException;
- method public abstract boolean removeCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- method public abstract java.util.List<android.net.wifi.passpoint.WifiPasspointPolicy> requestCredentialMatch(java.util.List<android.net.wifi.ScanResult>) throws android.os.RemoteException;
- method public abstract boolean updateCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- }
-
- public class WifiPasspointCredential implements android.os.Parcelable {
- ctor public WifiPasspointCredential(java.lang.String, java.lang.String, android.net.wifi.WifiEnterpriseConfig);
- method public int describeContents();
- method public android.net.wifi.WifiEnterpriseConfig getEnterpriseConfig();
- method public java.lang.String getHomeSpFqdn();
- method public java.lang.String getRealm();
- method public void setEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
- method public void setHomeFqdn(java.lang.String);
- method public void setRealm(java.lang.String);
- method public void writeToParcel(android.os.Parcel, int);
}
public class WifiPasspointInfo implements android.os.Parcelable {
@@ -18967,17 +18639,6 @@
field public java.lang.String ssid;
}
- public class WifiPasspointPolicy implements android.os.Parcelable {
- method public android.net.wifi.WifiConfiguration createWifiConfiguration();
- method public int describeContents();
- method public java.lang.String getBssid();
- method public android.net.wifi.passpoint.WifiPasspointCredential getCredential();
- method public int getCredentialPriority();
- method public int getRoamingPriority();
- method public java.lang.String getSsid();
- method public void writeToParcel(android.os.Parcel, int);
- }
-
}
package android.nfc {
@@ -22810,7 +22471,6 @@
field public static final deprecated int FULL_WAKE_LOCK = 26; // 0x1a
field public static final int ON_AFTER_RELEASE = 536870912; // 0x20000000
field public static final int PARTIAL_WAKE_LOCK = 1; // 0x1
- field public static final java.lang.String REBOOT_RECOVERY = "recovery";
field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa
field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6
}
@@ -23028,9 +22688,9 @@
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
method public boolean setRestrictionsChallenge(java.lang.String);
- method public void setUserRestriction(java.lang.String, boolean);
- method public void setUserRestrictions(android.os.Bundle);
- method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
+ method public deprecated void setUserRestriction(java.lang.String, boolean);
+ method public deprecated void setUserRestrictions(android.os.Bundle);
+ method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";
field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";
@@ -25886,8 +25546,10 @@
field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";
+ field public static final java.lang.String ACTION_USAGE_ACCESS_SETTINGS = "android.settings.USAGE_ACCESS_SETTINGS";
field public static final java.lang.String ACTION_USER_DICTIONARY_SETTINGS = "android.settings.USER_DICTIONARY_SETTINGS";
field public static final java.lang.String ACTION_VOICE_CONTROL_AIRPLANE_MODE = "android.settings.VOICE_CONTROL_AIRPLANE_MODE";
+ field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS";
field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
@@ -27725,6 +27387,16 @@
}
+package android.service.restrictions {
+
+ public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {
+ ctor public RestrictionsReceiver();
+ method public void onReceive(android.content.Context, android.content.Intent);
+ method public abstract void onRequestPermission(android.content.Context, java.lang.String, java.lang.String, java.lang.String, android.os.PersistableBundle);
+ }
+
+}
+
package android.service.textservice {
public abstract class SpellCheckerService extends android.app.Service {
@@ -28812,70 +28484,9 @@
package android.telecomm {
- public final class Call {
- method public void addListener(android.telecomm.Call.Listener);
- method public void answer(int);
- method public void conference(android.telecomm.Call);
- method public void disconnect();
- method public java.util.List<java.lang.String> getCannedTextResponses();
- method public java.util.List<android.telecomm.Call> getChildren();
- method public java.util.List<android.telecomm.Call> getConferenceableCalls();
- method public android.telecomm.Call.Details getDetails();
- method public android.telecomm.Call getParent();
- method public java.lang.String getRemainingPostDialSequence();
- method public int getState();
- method public android.telecomm.InCallService.VideoCall getVideoCall();
- method public void hold();
- method public void phoneAccountClicked();
- method public void phoneAccountSelected(android.telecomm.PhoneAccountHandle);
- method public void playDtmfTone(char);
- method public void postDialContinue(boolean);
- method public void reject(boolean, java.lang.String);
- method public void removeListener(android.telecomm.Call.Listener);
- method public void splitFromConference();
- method public void stopDtmfTone();
- method public void swapWithBackgroundCall();
- method public void unhold();
- field public static final int STATE_ACTIVE = 4; // 0x4
- field public static final int STATE_CONNECTING = 9; // 0x9
- field public static final int STATE_DIALING = 1; // 0x1
- field public static final int STATE_DISCONNECTED = 7; // 0x7
- field public static final int STATE_HOLDING = 3; // 0x3
- field public static final int STATE_NEW = 0; // 0x0
- field public static final int STATE_PRE_DIAL_WAIT = 8; // 0x8
- field public static final int STATE_RINGING = 2; // 0x2
- }
-
- public static class Call.Details {
- method public android.telecomm.PhoneAccountHandle getAccountHandle();
- method public int getCallCapabilities();
- method public java.lang.String getCallerDisplayName();
- method public int getCallerDisplayNamePresentation();
- method public long getConnectTimeMillis();
- method public int getDisconnectCauseCode();
- method public java.lang.String getDisconnectCauseMsg();
- method public android.telecomm.GatewayInfo getGatewayInfo();
- method public android.net.Uri getHandle();
- method public int getHandlePresentation();
- method public android.telecomm.StatusHints getStatusHints();
- method public int getVideoState();
- }
-
- public static abstract class Call.Listener {
- ctor public Call.Listener();
- method public void onCallDestroyed(android.telecomm.Call);
- method public void onCannedTextResponsesLoaded(android.telecomm.Call, java.util.List<java.lang.String>);
- method public void onChildrenChanged(android.telecomm.Call, java.util.List<android.telecomm.Call>);
- method public void onConferenceableCallsChanged(android.telecomm.Call, java.util.List<android.telecomm.Call>);
- method public void onDetailsChanged(android.telecomm.Call, android.telecomm.Call.Details);
- method public void onParentChanged(android.telecomm.Call, android.telecomm.Call);
- method public void onPostDialWait(android.telecomm.Call, java.lang.String);
- method public void onStartActivity(android.telecomm.Call, android.app.PendingIntent);
- method public void onStateChanged(android.telecomm.Call, int);
- method public void onVideoCallChanged(android.telecomm.Call, android.telecomm.InCallService.VideoCall);
- }
-
- public final class CallAudioState implements android.os.Parcelable {
+ public final class AudioState implements android.os.Parcelable {
+ ctor public AudioState(boolean, int, int);
+ ctor public AudioState(android.telecomm.AudioState);
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@@ -28890,8 +28501,8 @@
field public final int supportedRouteMask;
}
- public final class CallCameraCapabilities implements android.os.Parcelable {
- ctor public CallCameraCapabilities(boolean, float, int, int);
+ public final class CameraCapabilities implements android.os.Parcelable {
+ ctor public CameraCapabilities(boolean, float, int, int);
method public int describeContents();
method public int getHeight();
method public float getMaxZoom();
@@ -28901,69 +28512,48 @@
field public static final android.os.Parcelable.Creator CREATOR;
}
- public final class CallCapabilities {
- method public static java.lang.String toString(int);
- field public static final int ADD_CALL = 16; // 0x10
- field public static final int ALL = 3327; // 0xcff
- field public static final int GENERIC_CONFERENCE = 128; // 0x80
- field public static final int HOLD = 1; // 0x1
- field public static final int MERGE_CALLS = 4; // 0x4
- field public static final int MUTE = 64; // 0x40
- field public static final int RESPOND_VIA_TEXT = 32; // 0x20
- field public static final int SUPPORTS_VT_LOCAL = 256; // 0x100
- field public static final int SUPPORTS_VT_REMOTE = 512; // 0x200
- field public static final int SUPPORT_HOLD = 2; // 0x2
- field public static final int SWAP_CALLS = 8; // 0x8
- field public static final int VoLTE = 1024; // 0x400
- field public static final int VoWIFI = 2048; // 0x800
- }
-
- public class CallPropertyPresentation {
- ctor public CallPropertyPresentation();
- field public static final int ALLOWED = 1; // 0x1
- field public static final int PAYPHONE = 4; // 0x4
- field public static final int RESTRICTED = 2; // 0x2
- field public static final int UNKNOWN = 3; // 0x3
- }
-
- public final class CallState extends java.lang.Enum {
- method public static android.telecomm.CallState valueOf(java.lang.String);
- method public static final android.telecomm.CallState[] values();
- enum_constant public static final android.telecomm.CallState ACTIVE;
- enum_constant public static final android.telecomm.CallState CONNECTING;
- enum_constant public static final android.telecomm.CallState DIALING;
- enum_constant public static final android.telecomm.CallState DISCONNECTED;
- enum_constant public static final android.telecomm.CallState NEW;
- enum_constant public static final android.telecomm.CallState ON_HOLD;
- enum_constant public static final android.telecomm.CallState PRE_DIAL_WAIT;
- enum_constant public static final android.telecomm.CallState RINGING;
+ public abstract class Conference {
+ ctor public Conference(android.telecomm.PhoneAccountHandle);
+ method public boolean addConnection(android.telecomm.Connection);
+ method public void destroy();
+ method public final int getCapabilities();
+ method public final java.util.List<android.telecomm.Connection> getConnections();
+ method public final android.telecomm.PhoneAccountHandle getPhoneAccount();
+ method public final int getState();
+ method public void onDisconnect();
+ method public void onHold();
+ method public void onSeparate(android.telecomm.Connection);
+ method public void onUnhold();
+ method public void removeConnection(android.telecomm.Connection);
+ method public final void setActive();
+ method public final void setCapabilities(int);
+ method public final void setDisconnected(int, java.lang.String);
+ method public final void setOnHold();
}
public abstract class Connection {
ctor public Connection();
+ method public static android.telecomm.Connection createCanceledConnection();
+ method public static android.telecomm.Connection createFailedConnection(int, java.lang.String);
method public final void destroy();
method public final boolean getAudioModeIsVoip();
- method public final android.telecomm.CallAudioState getCallAudioState();
+ method public final android.telecomm.AudioState getAudioState();
method public final int getCallCapabilities();
method public final java.lang.String getCallerDisplayName();
method public final int getCallerDisplayNamePresentation();
- method public static android.telecomm.Connection getCanceledConnection();
- method public final java.util.List<android.telecomm.Connection> getChildConnections();
- method public static android.telecomm.Connection getFailedConnection(int, java.lang.String);
+ method public final android.telecomm.Conference getConference();
+ method public final java.util.List<android.telecomm.Connection> getConferenceableConnections();
method public final int getFailureCode();
method public final java.lang.String getFailureMessage();
method public final android.net.Uri getHandle();
method public final int getHandlePresentation();
- method public final android.telecomm.Connection getParentConnection();
method public final int getState();
method public final android.telecomm.StatusHints getStatusHints();
- method public final android.telecomm.ConnectionService.VideoCallProvider getVideoCallProvider();
+ method public final android.telecomm.Connection.VideoProvider getVideoProvider();
method public final int getVideoState();
- method public final boolean isConferenceConnection();
method public final boolean isRequestingRingback();
method public void onAbort();
method public void onAnswer(int);
- method public void onChildrenChanged(java.util.List<android.telecomm.Connection>);
method public void onConferenceWith(android.telecomm.Connection);
method public void onDisconnect();
method public void onHold();
@@ -28972,53 +28562,72 @@
method public void onPostDialContinue(boolean);
method public void onReject();
method public void onSeparate();
- method public void onSetAudioState(android.telecomm.CallAudioState);
+ method public void onSetAudioState(android.telecomm.AudioState);
method public void onSetState(int);
method public void onStopDtmfTone();
- method public void onSwapWithBackgroundCall();
method public void onUnhold();
method public final void setActive();
method public final void setAudioModeIsVoip(boolean);
method public final void setCallCapabilities(int);
method public final void setCallerDisplayName(java.lang.String, int);
- method public final void setCanceled();
method public final void setConferenceableConnections(java.util.List<android.telecomm.Connection>);
+ method public final void setConnectionService(android.telecomm.ConnectionService);
method public final void setDialing();
method public final void setDisconnected(int, java.lang.String);
- method public final void setFailed(int, java.lang.String);
method public final void setHandle(android.net.Uri, int);
method public final void setInitialized();
method public final void setInitializing();
method public final void setOnHold();
- method public final void setParentConnection(android.telecomm.Connection);
method public final void setPostDialWait(java.lang.String);
method public final void setRequestingRingback(boolean);
method public final void setRinging();
- method public final void setSignal(android.os.Bundle);
method public final void setStatusHints(android.telecomm.StatusHints);
- method public final void setVideoCallProvider(android.telecomm.ConnectionService.VideoCallProvider);
+ method public final void setVideoProvider(android.telecomm.Connection.VideoProvider);
method public final void setVideoState(int);
method public final void startActivityFromInCall(android.app.PendingIntent);
method public static java.lang.String stateToString(int);
+ field public static final int STATE_ACTIVE = 4; // 0x4
+ field public static final int STATE_DIALING = 3; // 0x3
+ field public static final int STATE_DISCONNECTED = 6; // 0x6
+ field public static final int STATE_HOLDING = 5; // 0x5
+ field public static final int STATE_INITIALIZING = 0; // 0x0
+ field public static final int STATE_NEW = 1; // 0x1
+ field public static final int STATE_RINGING = 2; // 0x2
}
- public final class Connection.State {
- field public static final int ACTIVE = 4; // 0x4
- field public static final int CANCELED = 8; // 0x8
- field public static final int DIALING = 3; // 0x3
- field public static final int DISCONNECTED = 6; // 0x6
- field public static final int FAILED = 7; // 0x7
- field public static final int HOLDING = 5; // 0x5
- field public static final int INITIALIZING = 0; // 0x0
- field public static final int NEW = 1; // 0x1
- field public static final int RINGING = 2; // 0x2
+ public static abstract class Connection.VideoProvider {
+ ctor public Connection.VideoProvider();
+ method public void changeCallDataUsage(int);
+ method public void changeCameraCapabilities(android.telecomm.CameraCapabilities);
+ method public void changePeerDimensions(int, int);
+ method public void handleCallSessionEvent(int);
+ method public abstract void onRequestCallDataUsage();
+ method public abstract void onRequestCameraCapabilities();
+ method public abstract void onSendSessionModifyRequest(android.telecomm.VideoProfile);
+ method public abstract void onSendSessionModifyResponse(android.telecomm.VideoProfile);
+ method public abstract void onSetCamera(java.lang.String);
+ method public abstract void onSetDeviceOrientation(int);
+ method public abstract void onSetDisplaySurface(android.view.Surface);
+ method public abstract void onSetPauseImage(java.lang.String);
+ method public abstract void onSetPreviewSurface(android.view.Surface);
+ method public abstract void onSetZoom(float);
+ method public void receiveSessionModifyRequest(android.telecomm.VideoProfile);
+ method public void receiveSessionModifyResponse(int, android.telecomm.VideoProfile, android.telecomm.VideoProfile);
+ field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
+ field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
+ field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
+ field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2
+ field public static final int SESSION_EVENT_TX_START = 3; // 0x3
+ field public static final int SESSION_EVENT_TX_STOP = 4; // 0x4
+ field public static final int SESSION_MODIFY_REQUEST_FAIL = 2; // 0x2
+ field public static final int SESSION_MODIFY_REQUEST_INVALID = 3; // 0x3
+ field public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1; // 0x1
}
public final class ConnectionRequest implements android.os.Parcelable {
- ctor public ConnectionRequest(android.telecomm.PhoneAccountHandle, java.lang.String, android.net.Uri, int, android.os.Bundle, int);
+ ctor public ConnectionRequest(android.telecomm.PhoneAccountHandle, android.net.Uri, int, android.os.Bundle, int);
method public int describeContents();
method public android.telecomm.PhoneAccountHandle getAccountHandle();
- method public java.lang.String getCallId();
method public android.os.Bundle getExtras();
method public android.net.Uri getHandle();
method public int getHandlePresentation();
@@ -29029,44 +28638,19 @@
public abstract class ConnectionService extends android.app.Service {
ctor public ConnectionService();
+ method public final void addConference(android.telecomm.Conference);
method public final android.telecomm.RemoteConnection createRemoteIncomingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest);
method public final android.telecomm.RemoteConnection createRemoteOutgoingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest);
method public final java.util.Collection<android.telecomm.Connection> getAllConnections();
method public final android.os.IBinder onBind(android.content.Intent);
+ method public void onConference(android.telecomm.Connection, android.telecomm.Connection);
method public void onConnectionAdded(android.telecomm.Connection);
method public void onConnectionRemoved(android.telecomm.Connection);
- method public void onCreateConferenceConnection(java.lang.String, android.telecomm.Connection, android.telecomm.Response<java.lang.String, android.telecomm.Connection>);
method public android.telecomm.Connection onCreateIncomingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest);
method public android.telecomm.Connection onCreateOutgoingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest);
field public static final java.lang.String SERVICE_INTERFACE = "android.telecomm.ConnectionService";
}
- public static abstract interface ConnectionService.CreateConnectionResponse {
- method public abstract void onCancel(android.telecomm.ConnectionRequest);
- method public abstract void onFailure(android.telecomm.ConnectionRequest, int, java.lang.String);
- method public abstract void onSuccess(android.telecomm.ConnectionRequest, CONNECTION);
- }
-
- public static abstract class ConnectionService.VideoCallProvider {
- ctor public ConnectionService.VideoCallProvider();
- method public void changeCallDataUsage(int);
- method public void changeCameraCapabilities(android.telecomm.CallCameraCapabilities);
- method public void changePeerDimensions(int, int);
- method public void handleCallSessionEvent(int);
- method public void onRequestCallDataUsage();
- method public void onRequestCameraCapabilities();
- method public void onSendSessionModifyRequest(android.telecomm.VideoCallProfile);
- method public void onSendSessionModifyResponse(android.telecomm.VideoCallProfile);
- method public void onSetCamera(java.lang.String);
- method public void onSetDeviceOrientation(int);
- method public void onSetDisplaySurface(android.view.Surface);
- method public void onSetPauseImage(java.lang.String);
- method public void onSetPreviewSurface(android.view.Surface);
- method public void onSetZoom(float);
- method public void receiveSessionModifyRequest(android.telecomm.VideoCallProfile);
- method public void receiveSessionModifyResponse(int, android.telecomm.VideoCallProfile, android.telecomm.VideoCallProfile);
- }
-
public class GatewayInfo implements android.os.Parcelable {
method public int describeContents();
method public android.net.Uri getGatewayHandle();
@@ -29077,87 +28661,8 @@
field public static final android.os.Parcelable.Creator CREATOR;
}
- public final class InCallAdapter {
- method public void answerCall(java.lang.String, int);
- method public void disconnectCall(java.lang.String);
- method public void holdCall(java.lang.String);
- method public void mute(boolean);
- method public void phoneAccountClicked(java.lang.String);
- method public void phoneAccountSelected(java.lang.String, android.telecomm.PhoneAccountHandle);
- method public void playDtmfTone(java.lang.String, char);
- method public void postDialContinue(java.lang.String, boolean);
- method public void rejectCall(java.lang.String, boolean, java.lang.String);
- method public void setAudioRoute(int);
- method public void stopDtmfTone(java.lang.String);
- method public void swapWithBackgroundCall(java.lang.String);
- method public void turnProximitySensorOff(boolean);
- method public void turnProximitySensorOn();
- method public void unholdCall(java.lang.String);
- }
-
- public abstract class InCallService extends android.app.Service {
- ctor public InCallService();
- method public android.telecomm.Phone getPhone();
- method public android.os.IBinder onBind(android.content.Intent);
- method public void onPhoneCreated(android.telecomm.Phone);
- method public void onPhoneDestroyed(android.telecomm.Phone);
- }
-
- public static abstract class InCallService.VideoCall {
- ctor public InCallService.VideoCall();
- method public abstract void requestCallDataUsage();
- method public abstract void requestCameraCapabilities();
- method public abstract void sendSessionModifyRequest(android.telecomm.VideoCallProfile);
- method public abstract void sendSessionModifyResponse(android.telecomm.VideoCallProfile);
- method public abstract void setCamera(java.lang.String);
- method public abstract void setDeviceOrientation(int);
- method public abstract void setDisplaySurface(android.view.Surface);
- method public abstract void setPauseImage(java.lang.String);
- method public abstract void setPreviewSurface(android.view.Surface);
- method public abstract void setVideoCallListener(android.telecomm.InCallService.VideoCall.Listener);
- method public abstract void setZoom(float);
- field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
- field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
- field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
- field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2
- field public static final int SESSION_EVENT_TX_START = 3; // 0x3
- field public static final int SESSION_EVENT_TX_STOP = 4; // 0x4
- field public static final int SESSION_MODIFY_REQUEST_FAIL = 2; // 0x2
- field public static final int SESSION_MODIFY_REQUEST_INVALID = 3; // 0x3
- field public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1; // 0x1
- }
-
- public static abstract class InCallService.VideoCall.Listener {
- ctor public InCallService.VideoCall.Listener();
- method public abstract void onCallDataUsageChanged(int);
- method public abstract void onCallSessionEvent(int);
- method public abstract void onCameraCapabilitiesChanged(android.telecomm.CallCameraCapabilities);
- method public abstract void onPeerDimensionsChanged(int, int);
- method public abstract void onSessionModifyRequestReceived(android.telecomm.VideoCallProfile);
- method public abstract void onSessionModifyResponseReceived(int, android.telecomm.VideoCallProfile, android.telecomm.VideoCallProfile);
- }
-
- public final class Phone {
- method public final void addListener(android.telecomm.Phone.Listener);
- method public final android.telecomm.CallAudioState getAudioState();
- method public final java.util.List<android.telecomm.Call> getCalls();
- method public final void removeListener(android.telecomm.Phone.Listener);
- method public final void setAudioRoute(int);
- method public final void setMuted(boolean);
- method public final void setProximitySensorOff(boolean);
- method public final void setProximitySensorOn();
- }
-
- public static abstract class Phone.Listener {
- ctor public Phone.Listener();
- method public void onAudioStateChanged(android.telecomm.Phone, android.telecomm.CallAudioState);
- method public void onBringToForeground(android.telecomm.Phone, boolean);
- method public void onCallAdded(android.telecomm.Phone, android.telecomm.Call);
- method public void onCallRemoved(android.telecomm.Phone, android.telecomm.Call);
- }
-
public class PhoneAccount implements android.os.Parcelable {
- ctor public PhoneAccount(android.telecomm.PhoneAccountHandle, android.net.Uri, java.lang.String, int, int, java.lang.CharSequence, java.lang.CharSequence);
+ method public static android.telecomm.PhoneAccount.Builder builder();
method public int describeContents();
method public android.telecomm.PhoneAccountHandle getAccountHandle();
method public int getCapabilities();
@@ -29174,6 +28679,17 @@
field public static final android.os.Parcelable.Creator CREATOR;
}
+ public static class PhoneAccount.Builder {
+ method public android.telecomm.PhoneAccount build();
+ method public android.telecomm.PhoneAccount.Builder withAccountHandle(android.telecomm.PhoneAccountHandle);
+ method public android.telecomm.PhoneAccount.Builder withCapabilities(int);
+ method public android.telecomm.PhoneAccount.Builder withHandle(android.net.Uri);
+ method public android.telecomm.PhoneAccount.Builder withIconResId(int);
+ method public android.telecomm.PhoneAccount.Builder withLabel(java.lang.CharSequence);
+ method public android.telecomm.PhoneAccount.Builder withShortDescription(java.lang.CharSequence);
+ method public android.telecomm.PhoneAccount.Builder withSubscriptionNumber(java.lang.String);
+ }
+
public class PhoneAccountHandle implements android.os.Parcelable {
ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
method public int describeContents();
@@ -29183,6 +28699,31 @@
field public static final android.os.Parcelable.Creator CREATOR;
}
+ public final class PhoneCapabilities {
+ method public static java.lang.String toString(int);
+ field public static final int ADD_CALL = 16; // 0x10
+ field public static final int ALL = 3327; // 0xcff
+ field public static final int GENERIC_CONFERENCE = 128; // 0x80
+ field public static final int HOLD = 1; // 0x1
+ field public static final int MERGE_CALLS = 4; // 0x4
+ field public static final int MUTE = 64; // 0x40
+ field public static final int RESPOND_VIA_TEXT = 32; // 0x20
+ field public static final int SUPPORTS_VT_LOCAL = 256; // 0x100
+ field public static final int SUPPORTS_VT_REMOTE = 512; // 0x200
+ field public static final int SUPPORT_HOLD = 2; // 0x2
+ field public static final int SWAP_CALLS = 8; // 0x8
+ field public static final int VoLTE = 1024; // 0x400
+ field public static final int VoWIFI = 2048; // 0x800
+ }
+
+ public class PropertyPresentation {
+ ctor public PropertyPresentation();
+ field public static final int ALLOWED = 1; // 0x1
+ field public static final int PAYPHONE = 4; // 0x4
+ field public static final int RESTRICTED = 2; // 0x2
+ field public static final int UNKNOWN = 3; // 0x3
+ }
+
public final class RemoteConnection {
method public void abort();
method public void addListener(android.telecomm.RemoteConnection.Listener);
@@ -29209,9 +28750,8 @@
method public void postDialContinue(boolean);
method public void reject();
method public void removeListener(android.telecomm.RemoteConnection.Listener);
- method public void setAudioState(android.telecomm.CallAudioState);
+ method public void setAudioState(android.telecomm.AudioState);
method public void stopDtmfTone();
- method public void swapWithBackgroundCall();
method public void unhold();
}
@@ -29239,18 +28779,13 @@
method public abstract void onResult(IN, OUT...);
}
- public abstract interface SimpleResponse {
- method public abstract void onError(IN);
- method public abstract void onResult(IN, OUT);
- }
-
public final class StatusHints implements android.os.Parcelable {
ctor public StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle);
method public int describeContents();
method public android.content.ComponentName getComponentName();
method public android.os.Bundle getExtras();
method public android.graphics.drawable.Drawable getIcon(android.content.Context);
- method public int getIconId();
+ method public int getIconResId();
method public java.lang.CharSequence getLabel();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@@ -29278,23 +28813,9 @@
field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE";
}
- public class VideoCallImpl extends android.telecomm.InCallService.VideoCall {
- method public void requestCallDataUsage();
- method public void requestCameraCapabilities();
- method public void sendSessionModifyRequest(android.telecomm.VideoCallProfile);
- method public void sendSessionModifyResponse(android.telecomm.VideoCallProfile);
- method public void setCamera(java.lang.String);
- method public void setDeviceOrientation(int);
- method public void setDisplaySurface(android.view.Surface);
- method public void setPauseImage(java.lang.String);
- method public void setPreviewSurface(android.view.Surface);
- method public void setVideoCallListener(android.telecomm.InCallService.VideoCall.Listener);
- method public void setZoom(float);
- }
-
- public class VideoCallProfile implements android.os.Parcelable {
- ctor public VideoCallProfile(int);
- ctor public VideoCallProfile(int, int);
+ public class VideoProfile implements android.os.Parcelable {
+ ctor public VideoProfile(int);
+ ctor public VideoProfile(int, int);
method public int describeContents();
method public int getQuality();
method public int getVideoState();
@@ -29306,8 +28827,8 @@
field public static final int QUALITY_MEDIUM = 2; // 0x2
}
- public static class VideoCallProfile.VideoState {
- ctor public VideoCallProfile.VideoState();
+ public static class VideoProfile.VideoState {
+ ctor public VideoProfile.VideoState();
method public static boolean isAudioOnly(int);
method public static boolean isBidirectional(int);
method public static boolean isPaused(int);
@@ -29857,6 +29378,7 @@
method public int hasCarrierPrivileges();
method public boolean hasIccCard();
method public boolean iccCloseLogicalChannel(int);
+ method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
@@ -32458,6 +31980,8 @@
method public void captureEndValues(android.transition.TransitionValues);
method public void captureStartValues(android.transition.TransitionValues);
method public int getOrdering();
+ method public android.transition.Transition getTransitionAt(int);
+ method public int getTransitionCount();
method public android.transition.TransitionSet removeTransition(android.transition.Transition);
method public android.transition.TransitionSet setOrdering(int);
field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
@@ -32622,6 +32146,7 @@
method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults();
field public static final int DENSITY_400 = 400; // 0x190
+ field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78
@@ -35407,6 +34932,8 @@
ctor public ViewOutlineProvider();
method public abstract void getOutline(android.view.View, android.graphics.Outline);
field public static final android.view.ViewOutlineProvider BACKGROUND;
+ field public static final android.view.ViewOutlineProvider BOUNDS;
+ field public static final android.view.ViewOutlineProvider PADDED_BOUNDS;
}
public class ViewOverlay {
diff --git a/cmds/appops/Android.mk b/cmds/appops/Android.mk
new file mode 100644
index 0000000..1e15204
--- /dev/null
+++ b/cmds/appops/Android.mk
@@ -0,0 +1,16 @@
+# Copyright 2014 The Android Open Source Project
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_MODULE := appops
+include $(BUILD_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := appops
+LOCAL_SRC_FILES := appops
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
+
diff --git a/cmds/appops/MODULE_LICENSE_APACHE2 b/cmds/appops/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cmds/appops/MODULE_LICENSE_APACHE2
diff --git a/cmds/appops/NOTICE b/cmds/appops/NOTICE
new file mode 100644
index 0000000..06a9081
--- /dev/null
+++ b/cmds/appops/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2005-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.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/cmds/appops/appops b/cmds/appops/appops
new file mode 100755
index 0000000..407e551
--- /dev/null
+++ b/cmds/appops/appops
@@ -0,0 +1,5 @@
+# Script to start "appwidget" on the device, which has a very rudimentary shell.
+base=/system
+export CLASSPATH=$base/framework/appops.jar
+exec app_process $base/bin com.android.commands.appops.AppOpsCommand "$@"
+
diff --git a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
new file mode 100644
index 0000000..c414f58
--- /dev/null
+++ b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
@@ -0,0 +1,137 @@
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+package com.android.commands.appops;
+
+import android.app.ActivityManager;
+import android.app.ActivityThread;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+
+import com.android.internal.app.IAppOpsService;
+import com.android.internal.os.BaseCommand;
+
+import java.io.PrintStream;
+
+/**
+ * This class is a command line utility for manipulating AppOps permissions.
+ */
+public class AppOpsCommand extends BaseCommand {
+
+ public static void main(String[] args) {
+ new AppOpsCommand().run(args);
+ }
+
+ @Override
+ public void onShowUsage(PrintStream out) {
+ out.println("usage: adb shell appops set <PACKAGE> <OP> "
+ + "<allow|ignore|deny|default> [--user <USER_ID>]\n"
+ + " <PACKAGE> an Android package name.\n"
+ + " <OP> an AppOps operation.\n"
+ + " <USER_ID> the user id under which the package is installed. If --user is not\n"
+ + " specified, the current user is assumed.\n");
+ }
+
+ private static final String COMMAND_SET = "set";
+
+ @Override
+ public void onRun() throws Exception {
+ String command = nextArgRequired();
+ switch (command) {
+ case COMMAND_SET:
+ runSet();
+ break;
+
+ default:
+ throw new IllegalArgumentException("Unknown command '" + command + "'.");
+ }
+ }
+
+ private static final String ARGUMENT_USER = "--user";
+
+ // Modes
+ private static final String MODE_ALLOW = "allow";
+ private static final String MODE_DENY = "deny";
+ private static final String MODE_IGNORE = "ignore";
+ private static final String MODE_DEFAULT = "default";
+
+ private void runSet() throws Exception {
+ String packageName = null;
+ String op = null;
+ String mode = null;
+ int userId = UserHandle.USER_CURRENT;
+ for (String argument; (argument = nextArg()) != null;) {
+ if (ARGUMENT_USER.equals(argument)) {
+ userId = Integer.parseInt(nextArgRequired());
+ } else {
+ if (packageName == null) {
+ packageName = argument;
+ } else if (op == null) {
+ op = argument;
+ } else if (mode == null) {
+ mode = argument;
+ } else {
+ throw new IllegalArgumentException("Unsupported argument: " + argument);
+ }
+ }
+ }
+
+ if (packageName == null) {
+ throw new IllegalArgumentException("Package name not specified.");
+ } else if (op == null) {
+ throw new IllegalArgumentException("Operation not specified.");
+ } else if (mode == null) {
+ throw new IllegalArgumentException("Mode not specified.");
+ }
+
+ final int opInt = AppOpsManager.strOpToOp(op);
+ final int modeInt;
+ switch (mode) {
+ case MODE_ALLOW:
+ modeInt = AppOpsManager.MODE_ALLOWED;
+ break;
+ case MODE_DENY:
+ modeInt = AppOpsManager.MODE_ERRORED;
+ break;
+ case MODE_IGNORE:
+ modeInt = AppOpsManager.MODE_IGNORED;
+ break;
+ case MODE_DEFAULT:
+ modeInt = AppOpsManager.MODE_DEFAULT;
+ break;
+ default:
+ throw new IllegalArgumentException("Mode is invalid.");
+ }
+
+ // Parsing complete, let's execute the command.
+
+ if (userId == UserHandle.USER_CURRENT) {
+ userId = ActivityManager.getCurrentUser();
+ }
+
+ final IPackageManager pm = ActivityThread.getPackageManager();
+ final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
+ ServiceManager.getService(Context.APP_OPS_SERVICE));
+ final int uid = pm.getPackageUid(packageName, userId);
+ if (uid < 0) {
+ throw new Exception("No UID for " + packageName + " for user " + userId);
+ }
+ appOpsService.setMode(opInt, uid, packageName, modeInt);
+ }
+}
diff --git a/cmds/media/src/com/android/commands/media/Media.java b/cmds/media/src/com/android/commands/media/Media.java
index d9faf4c..b37f896 100644
--- a/cmds/media/src/com/android/commands/media/Media.java
+++ b/cmds/media/src/com/android/commands/media/Media.java
@@ -178,6 +178,13 @@
public ControllerMonitor(ISessionController controller) {
mController = controller;
}
+
+ @Override
+ public void onSessionDestroyed() {
+ System.out.println("onSessionDestroyed. Enter q to quit.");
+
+ }
+
@Override
public void onEvent(String event, Bundle extras) {
System.out.println("onSessionEvent event=" + event + ", extras=" + extras);
@@ -218,7 +225,7 @@
void printUsageMessage() {
try {
System.out.println("V2Monitoring session " + mController.getTag()
- + "... available commands:");
+ + "... available commands: play, pause, next, previous");
} catch (RemoteException e) {
System.out.println("Error trying to monitor session!");
}
@@ -250,6 +257,14 @@
addNewline = false;
} else if ("q".equals(line) || "quit".equals(line)) {
break;
+ } else if ("play".equals(line)) {
+ mController.play();
+ } else if ("pause".equals(line)) {
+ mController.pause();
+ } else if ("next".equals(line)) {
+ mController.next();
+ } else if ("previous".equals(line)) {
+ mController.previous();
} else {
System.out.println("Invalid command: " + line);
}
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index c5e91e3..46d8ade 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -19,21 +19,22 @@
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
-import android.app.PackageDeleteObserver;
import android.app.PackageInstallObserver;
import android.content.ComponentName;
+import android.content.IIntentReceiver;
+import android.content.IIntentSender;
import android.content.Intent;
+import android.content.IntentSender;
import android.content.pm.ApplicationInfo;
import android.content.pm.FeatureInfo;
import android.content.pm.IPackageDataObserver;
import android.content.pm.IPackageInstaller;
import android.content.pm.IPackageManager;
-import android.content.pm.InstallSessionInfo;
-import android.content.pm.InstallSessionParams;
import android.content.pm.InstrumentationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageInstaller;
-import android.content.pm.PackageInstaller.CommitCallback;
+import android.content.pm.PackageInstaller.SessionInfo;
+import android.content.pm.PackageInstaller.SessionParams;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.content.pm.ParceledListSlice;
@@ -74,6 +75,8 @@
import java.util.Comparator;
import java.util.List;
import java.util.WeakHashMap;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
public final class Pm {
private static final String TAG = "Pm";
@@ -776,36 +779,6 @@
}
}
- class LocalCommitCallback extends CommitCallback {
- boolean finished;
- boolean success;
- String msg;
-
- private void setResult(boolean success, String msg) {
- synchronized (this) {
- this.finished = true;
- this.success = success;
- this.msg = msg;
- notifyAll();
- }
- }
-
- @Override
- public void onUserActionRequired(Intent intent) {
- setResult(false, "Unexepected user action required!");
- }
-
- @Override
- public void onSuccess() {
- setResult(true, null);
- }
-
- @Override
- public void onFailure(int failureReason, String msg, Bundle extras) {
- setResult(false, msg);
- }
- }
-
/**
* Converts a failure code into a string by using reflection to find a matching constant
* in PackageManager.
@@ -1007,8 +980,7 @@
private void runInstallCreate() throws RemoteException {
String installerPackageName = null;
- final InstallSessionParams params = new InstallSessionParams(
- InstallSessionParams.MODE_FULL_INSTALL);
+ final SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
params.installFlags = PackageManager.INSTALL_ALL_USERS;
String opt;
@@ -1031,7 +1003,7 @@
} else if (opt.equals("-d")) {
params.installFlags |= PackageManager.INSTALL_ALLOW_DOWNGRADE;
} else if (opt.equals("-p")) {
- params.mode = InstallSessionParams.MODE_INHERIT_EXISTING;
+ params.mode = SessionParams.MODE_INHERIT_EXISTING;
} else if (opt.equals("-S")) {
params.setSize(Long.parseLong(nextOptionData()));
} else if (opt.equals("--abi")) {
@@ -1073,7 +1045,7 @@
}
}
- final InstallSessionInfo info = mInstaller.getSessionInfo(sessionId);
+ final SessionInfo info = mInstaller.getSessionInfo(sessionId);
PackageInstaller.Session session = null;
InputStream in = null;
@@ -1117,22 +1089,20 @@
try {
session = new PackageInstaller.Session(mInstaller.openSession(sessionId));
- final LocalCommitCallback callback = new LocalCommitCallback();
- session.commit(callback);
+ final LocalIntentReceiver receiver = new LocalIntentReceiver();
+ session.commit(receiver.getIntentSender());
- synchronized (callback) {
- while (!callback.finished) {
- try {
- callback.wait();
- } catch (InterruptedException e) {
- }
- }
- if (!callback.success) {
- throw new IllegalStateException("Failure [" + callback.msg + "]");
- }
+ final Intent result = receiver.getResult();
+ final int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
+ PackageInstaller.STATUS_FAILURE);
+ if (status == PackageInstaller.STATUS_SUCCESS) {
+ System.out.println("Success");
+ } else {
+ Log.e(TAG, "Failure details: " + result.getExtras());
+ System.out.println("Failure ["
+ + result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + "]");
+ return;
}
-
- System.out.println("Success");
} finally {
IoUtils.closeQuietly(session);
}
@@ -1274,28 +1244,14 @@
}
}
- class LocalPackageDeleteObserver extends PackageDeleteObserver {
- boolean finished;
- boolean result;
-
- @Override
- public void onPackageDeleted(String name, int returnCode, String msg) {
- synchronized (this) {
- finished = true;
- result = returnCode == PackageManager.DELETE_SUCCEEDED;
- notifyAll();
- }
- }
- }
-
- private void runUninstall() {
- int unInstallFlags = 0;
+ private void runUninstall() throws RemoteException {
+ int flags = 0;
int userId = UserHandle.USER_ALL;
String opt;
while ((opt=nextOption()) != null) {
if (opt.equals("-k")) {
- unInstallFlags |= PackageManager.DELETE_KEEP_DATA;
+ flags |= PackageManager.DELETE_KEEP_DATA;
} else if (opt.equals("--user")) {
String param = nextArg();
if (isNumber(param)) {
@@ -1320,7 +1276,7 @@
if (userId == UserHandle.USER_ALL) {
userId = UserHandle.USER_OWNER;
- unInstallFlags |= PackageManager.DELETE_ALL_USERS;
+ flags |= PackageManager.DELETE_ALL_USERS;
} else {
PackageInfo info;
try {
@@ -1340,38 +1296,25 @@
// user set flag so it disables rather than reverting to system
// version of the app.
if (isSystem) {
- unInstallFlags |= PackageManager.DELETE_SYSTEM_APP;
+ flags |= PackageManager.DELETE_SYSTEM_APP;
}
}
- boolean result = deletePackage(pkg, unInstallFlags, userId);
- if (result) {
+ final LocalIntentReceiver receiver = new LocalIntentReceiver();
+ mInstaller.uninstall(pkg, flags, receiver.getIntentSender(), userId);
+
+ final Intent result = receiver.getResult();
+ final int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
+ PackageInstaller.STATUS_FAILURE);
+ if (status == PackageInstaller.STATUS_SUCCESS) {
System.out.println("Success");
} else {
- System.out.println("Failure");
+ Log.e(TAG, "Failure details: " + result.getExtras());
+ System.out.println("Failure ["
+ + result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + "]");
}
}
- private boolean deletePackage(String packageName, int flags, int userId) {
- LocalPackageDeleteObserver obs = new LocalPackageDeleteObserver();
- try {
- mInstaller.uninstall(packageName, flags, obs.getBinder(), userId);
-
- synchronized (obs) {
- while (!obs.finished) {
- try {
- obs.wait();
- } catch (InterruptedException e) {
- }
- }
- }
- } catch (RemoteException e) {
- System.err.println(e.toString());
- System.err.println(PM_NOT_RUNNING_ERR);
- }
- return obs.result;
- }
-
static class ClearDataObserver extends IPackageDataObserver.Stub {
boolean finished;
boolean result;
@@ -1384,7 +1327,6 @@
notifyAll();
}
}
-
}
private void runClear() {
@@ -1703,6 +1645,10 @@
throw new IllegalArgumentException("Missing ABI argument");
}
+ if ("-".equals(abi)) {
+ return abi;
+ }
+
final String[] supportedAbis = Build.SUPPORTED_ABIS;
for (String supportedAbi : supportedAbis) {
if (supportedAbi.equals(abi)) {
@@ -1713,6 +1659,35 @@
throw new IllegalArgumentException("ABI " + abi + " not supported on this device");
}
+ private static class LocalIntentReceiver {
+ private final SynchronousQueue<Intent> mResult = new SynchronousQueue<>();
+
+ private IIntentSender.Stub mLocalSender = new IIntentSender.Stub() {
+ @Override
+ public int send(int code, Intent intent, String resolvedType,
+ IIntentReceiver finishedReceiver, String requiredPermission) {
+ try {
+ mResult.offer(intent, 5, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ return 0;
+ }
+ };
+
+ public IntentSender getIntentSender() {
+ return new IntentSender((IIntentSender) mLocalSender);
+ }
+
+ public Intent getResult() {
+ try {
+ return mResult.poll(30, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
private String nextOption() {
if (mNextArg >= mArgs.length) {
return null;
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index fcfeddd..f5ac5f7 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -31,6 +31,7 @@
import android.annotation.IntDef;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentCallbacks2;
import android.content.ComponentName;
@@ -747,8 +748,8 @@
}
};
- // Most recent call to setMediaPlaying().
- boolean mMediaPlaying;
+ // Most recent call to requestVisibleBehind().
+ boolean mVisibleBehind;
ArrayMap<String, LoaderManagerImpl> mAllLoaderManagers;
LoaderManagerImpl mLoaderManager;
@@ -2094,7 +2095,9 @@
"by the window decor. Do not request Window.FEATURE_ACTION_BAR and set " +
"android:windowActionBar to false in your theme to use a Toolbar instead.");
}
- mActionBar = new ToolbarActionBar(toolbar, getTitle(), this);
+ ToolbarActionBar tbab = new ToolbarActionBar(toolbar, getTitle(), this);
+ mActionBar = tbab;
+ mWindow.setCallback(tbab.getWrappedWindowCallback());
mActionBar.invalidateOptionsMenu();
}
@@ -3819,6 +3822,29 @@
}
/**
+ * Start a new activity as if it was started by the activity that started our
+ * current activity. This is for the resolver and chooser activities, which operate
+ * as intermediaries that dispatch their intent to the target the user selects -- to
+ * do this, they must perform all security checks including permission grants as if
+ * their launch had come from the original activity.
+ * @hide
+ */
+ public void startActivityAsCaller(Intent intent, @Nullable Bundle options) {
+ if (mParent != null) {
+ throw new RuntimeException("Can't be called from a child");
+ }
+ Instrumentation.ActivityResult ar =
+ mInstrumentation.execStartActivityAsCaller(
+ this, mMainThread.getApplicationThread(), mToken, this,
+ intent, -1, options);
+ if (ar != null) {
+ mMainThread.sendActivityResult(
+ mToken, mEmbeddedID, -1, ar.getResultCode(),
+ ar.getResultData());
+ }
+ }
+
+ /**
* Same as calling {@link #startIntentSenderForResult(IntentSender, int,
* Intent, int, int, int, Bundle)} with no options.
*
@@ -5314,6 +5340,7 @@
*
* @hide
*/
+ @SystemApi
public void convertFromTranslucent() {
try {
mTranslucentCallback = null;
@@ -5350,6 +5377,7 @@
*
* @hide
*/
+ @SystemApi
public boolean convertToTranslucent(TranslucentConversionListener callback,
ActivityOptions options) {
boolean drawComplete;
@@ -5406,12 +5434,13 @@
}
/**
- * Activities that want to show media behind a translucent activity above them must call this
- * method anytime before a return from {@link #onPause()}. If this call is successful
- * then the activity should continue to play media when {@link #onPause()} is called, but must
- * stop playing and release resources prior to or within the call to
- * {@link #onStopMediaPlaying()}. If this call returns false the activity must stop
- * playing and release resources immediately.
+ * Activities that want to remain visible behind a translucent activity above them must call
+ * this method anytime before a return from {@link #onPause()}. If this call is successful
+ * then the activity will remain visible when {@link #onPause()} is called, and can continue to
+ * play media in the background, but it must stop playing and release resources prior to or
+ * within the call to {@link #onVisibleBehindCancelled()}. If this call returns false, the
+ * activity will not be visible in the background, and must release any media resources
+ * immediately.
*
* <p>Only fullscreen opaque activities may make this call. I.e. this call is a nop
* for dialog and translucent activities.
@@ -5419,85 +5448,86 @@
* <p>False will be returned any time this method is call between the return of onPause and
* the next call to onResume.
*
- * @param playing true to notify the system that media is starting or continuing playing,
- * false to indicate that media has stopped or is stopping. Resources must
- * be released when passing false to this method.
- * @return the resulting play state. If true the activity may continue playing media beyond
- * {@link #onPause()}, if false then the caller must stop playing and immediately
- * release all media resources. Returning false may occur in lieu of a call to
- * onReleaseMediaResources() so the return value must be checked.
+ * @param visible true to notify the system that the activity wishes to be visible behind other
+ * translucent activities, false to indicate otherwise. Resources must be
+ * released when passing false to this method.
+ * @return the resulting visibiity state. If true the activity may remain visible beyond
+ * {@link #onPause()}. If false then the activity may not count on being visible behind
+ * other translucent activities, and must stop any media playback and release resources.
+ * Returning false may occur in lieu of a call to onVisibleBehindCancelled() so the return
+ * value must be checked.
*
- * @see #isBackgroundMediaPlaying()
- * @see #onStopMediaPlaying()
- * @see #onBackgroundMediaPlayingChanged(boolean)
+ * @see #onVisibleBehindCancelled()
+ * @see #onBackgroundVisibleBehindChanged(boolean)
*/
- public boolean setMediaPlaying(boolean playing) {
+ public boolean requestVisibleBehind(boolean visible) {
if (!mResumed) {
- // Do not permit paused or stopped activities to start playing.
- playing = false;
+ // Do not permit paused or stopped activities to do this.
+ visible = false;
}
try {
- mMediaPlaying = ActivityManagerNative.getDefault().setMediaPlaying(mToken, playing) &&
- playing;
+ mVisibleBehind = ActivityManagerNative.getDefault()
+ .requestVisibleBehind(mToken, visible) && visible;
} catch (RemoteException e) {
- mMediaPlaying = false;
+ mVisibleBehind = false;
}
- return mMediaPlaying;
+ return mVisibleBehind;
}
/**
- * Called when a translucent activity over playing media is becoming opaque or another
- * activity is being launched. Activities that call {@link #setMediaPlaying(boolean)}
- * must implement this method to at the minimum call
- * <code>super.onStopMediaPlayback()</code>.
+ * Called when a translucent activity over this activity is becoming opaque or another
+ * activity is being launched. Activities that override this method must call
+ * <code>super.onVisibleBehindCancelled()</code> or a SuperNotCalledException will be thrown.
*
- * <p>When this method is called the activity has 500 msec to release the media resources.
+ * <p>When this method is called the activity has 500 msec to release any resources it may be
+ * using while visible in the background.
* If the activity has not returned from this method in 500 msec the system will destroy
- * the activity and kill the process in order to recover the media resources for another
+ * the activity and kill the process in order to recover the resources for another
* process. Otherwise {@link #onStop()} will be called following return.
*
- * @see #setMediaPlaying(boolean)
- * @see #isBackgroundMediaPlaying()
- * @see #onBackgroundMediaPlayingChanged(boolean)
+ * @see #requestVisibleBehind(boolean)
+ * @see #onBackgroundVisibleBehindChanged(boolean)
*/
- public void onStopMediaPlaying() {
+ public void onVisibleBehindCancelled() {
mCalled = true;
}
/**
- * Translucent activities may call this to determine if there is an activity below it that
- * is playing media.
+ * Translucent activities may call this to determine if there is an activity below them that
+ * is currently set to be visible in the background.
*
- * @return true if media is playing according to the most recent call to
- * {@link #setMediaPlaying(boolean)}, false otherwise.
+ * @return true if an activity below is set to visible according to the most recent call to
+ * {@link #requestVisibleBehind(boolean)}, false otherwise.
*
- * @see #setMediaPlaying(boolean)
- * @see #onStopMediaPlaying()
- * @see #onBackgroundMediaPlayingChanged(boolean)
+ * @see #requestVisibleBehind(boolean)
+ * @see #onVisibleBehindCancelled()
+ * @see #onBackgroundVisibleBehindChanged(boolean)
* @hide
*/
- public boolean isBackgroundMediaPlaying() {
+ @SystemApi
+ public boolean isBackgroundVisibleBehind() {
try {
- return ActivityManagerNative.getDefault().isBackgroundMediaPlaying(mToken);
+ return ActivityManagerNative.getDefault().isBackgroundVisibleBehind(mToken);
} catch (RemoteException e) {
}
return false;
}
/**
- * The topmost foreground activity will receive this call when an activity below it either
- * starts or stops playing media.
+ * The topmost foreground activity will receive this call when the background visibility state
+ * of the activity below it changes.
*
- * This call may be a consequence of {@link #setMediaPlaying(boolean)} or might be
+ * This call may be a consequence of {@link #requestVisibleBehind(boolean)} or might be
* due to a background activity finishing itself.
*
- * @param playing true if media playback is starting, false if it is stopping.
+ * @param visible true if a background activity is visible, false otherwise.
*
- * @see #setMediaPlaying(boolean)
- * @see #isBackgroundMediaPlaying()
- * @see #onStopMediaPlaying()
+ * @see #requestVisibleBehind(boolean)
+ * @see #onVisibleBehindCancelled()
+ * @hide
*/
- public void onBackgroundMediaPlayingChanged(boolean playing) {
+ @SystemApi
+ public void onBackgroundVisibleBehindChanged(boolean visible) {
}
/**
@@ -6114,6 +6144,7 @@
*
* @hide
*/
+ @SystemApi
public interface TranslucentConversionListener {
/**
* Callback made following {@link Activity#convertToTranslucent} once all visible Activities
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 311a8f55..1cb1047 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -169,6 +169,31 @@
return true;
}
+ case START_ACTIVITY_AS_CALLER_TRANSACTION:
+ {
+ data.enforceInterface(IActivityManager.descriptor);
+ IBinder b = data.readStrongBinder();
+ IApplicationThread app = ApplicationThreadNative.asInterface(b);
+ String callingPackage = data.readString();
+ Intent intent = Intent.CREATOR.createFromParcel(data);
+ String resolvedType = data.readString();
+ IBinder resultTo = data.readStrongBinder();
+ String resultWho = data.readString();
+ int requestCode = data.readInt();
+ int startFlags = data.readInt();
+ String profileFile = data.readString();
+ ParcelFileDescriptor profileFd = data.readInt() != 0
+ ? data.readFileDescriptor() : null;
+ Bundle options = data.readInt() != 0
+ ? Bundle.CREATOR.createFromParcel(data) : null;
+ int result = startActivityAsCaller(app, callingPackage, intent, resolvedType,
+ resultTo, resultWho, requestCode, startFlags,
+ profileFile, profileFd, options);
+ reply.writeNoException();
+ reply.writeInt(result);
+ return true;
+ }
+
case START_ACTIVITY_AND_WAIT_TRANSACTION:
{
data.enforceInterface(IActivityManager.descriptor);
@@ -1942,9 +1967,9 @@
return true;
}
- case DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION: {
+ case KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
- dismissKeyguardOnNextActivity();
+ keyguardWaitingForActivityDrawn();
reply.writeNoException();
return true;
}
@@ -2197,29 +2222,29 @@
return true;
}
- case SET_MEDIA_PLAYING_TRANSACTION: {
+ case REQUEST_VISIBLE_BEHIND_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder token = data.readStrongBinder();
boolean enable = data.readInt() > 0;
- boolean success = setMediaPlaying(token, enable);
+ boolean success = requestVisibleBehind(token, enable);
reply.writeNoException();
reply.writeInt(success ? 1 : 0);
return true;
}
- case IS_BG_MEDIA_PLAYING_TRANSACTION: {
+ case IS_BACKGROUND_VISIBLE_BEHIND_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder token = data.readStrongBinder();
- final boolean enabled = isBackgroundMediaPlaying(token);
+ final boolean enabled = isBackgroundVisibleBehind(token);
reply.writeNoException();
reply.writeInt(enabled ? 1 : 0);
return true;
}
- case MEDIA_RESOURCES_RELEASED_TRANSACTION: {
+ case BACKGROUND_RESOURCES_RELEASED_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder token = data.readStrongBinder();
- mediaResourcesReleased(token);
+ backgroundResourcesReleased(token);
reply.writeNoException();
return true;
}
@@ -2347,6 +2372,41 @@
data.recycle();
return result;
}
+ public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
+ int startFlags, String profileFile,
+ ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeStrongBinder(caller != null ? caller.asBinder() : null);
+ data.writeString(callingPackage);
+ intent.writeToParcel(data, 0);
+ data.writeString(resolvedType);
+ data.writeStrongBinder(resultTo);
+ data.writeString(resultWho);
+ data.writeInt(requestCode);
+ data.writeInt(startFlags);
+ data.writeString(profileFile);
+ if (profileFd != null) {
+ data.writeInt(1);
+ profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+ } else {
+ data.writeInt(0);
+ }
+ if (options != null) {
+ data.writeInt(1);
+ options.writeToParcel(data, 0);
+ } else {
+ data.writeInt(0);
+ }
+ mRemote.transact(START_ACTIVITY_AS_CALLER_TRANSACTION, data, reply, 0);
+ reply.readException();
+ int result = reply.readInt();
+ reply.recycle();
+ data.recycle();
+ return result;
+ }
public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int startFlags, String profileFile,
@@ -4738,11 +4798,11 @@
reply.recycle();
}
- public void dismissKeyguardOnNextActivity() throws RemoteException {
+ public void keyguardWaitingForActivityDrawn() throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
- mRemote.transact(DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION, data, reply, 0);
+ mRemote.transact(KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
reply.recycle();
@@ -5101,13 +5161,13 @@
}
@Override
- public boolean setMediaPlaying(IBinder token, boolean playing) throws RemoteException {
+ public boolean requestVisibleBehind(IBinder token, boolean visible) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- data.writeInt(playing ? 1 : 0);
- mRemote.transact(SET_MEDIA_PLAYING_TRANSACTION, data, reply, 0);
+ data.writeInt(visible ? 1 : 0);
+ mRemote.transact(REQUEST_VISIBLE_BEHIND_TRANSACTION, data, reply, 0);
reply.readException();
boolean success = reply.readInt() > 0;
data.recycle();
@@ -5116,26 +5176,27 @@
}
@Override
- public boolean isBackgroundMediaPlaying(IBinder token) throws RemoteException {
+ public boolean isBackgroundVisibleBehind(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(IS_BG_MEDIA_PLAYING_TRANSACTION, data, reply, 0);
+ mRemote.transact(IS_BACKGROUND_VISIBLE_BEHIND_TRANSACTION, data, reply, 0);
reply.readException();
- final boolean playing = reply.readInt() > 0;
+ final boolean visible = reply.readInt() > 0;
data.recycle();
reply.recycle();
- return playing;
+ return visible;
}
@Override
- public void mediaResourcesReleased(IBinder token) throws RemoteException {
+ public void backgroundResourcesReleased(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(MEDIA_RESOURCES_RELEASED_TRANSACTION, data, reply, IBinder.FLAG_ONEWAY);
+ mRemote.transact(BACKGROUND_RESOURCES_RELEASED_TRANSACTION, data, reply,
+ IBinder.FLAG_ONEWAY);
reply.readException();
data.recycle();
reply.recycle();
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 3a764fa..2136209 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1155,13 +1155,13 @@
}
@Override
- public void scheduleStopMediaPlaying(IBinder token) {
- sendMessage(H.STOP_MEDIA_PLAYING, token);
+ public void scheduleCancelVisibleBehind(IBinder token) {
+ sendMessage(H.CANCEL_VISIBLE_BEHIND, token);
}
@Override
- public void scheduleBackgroundMediaPlayingChanged(IBinder token, boolean playing) {
- sendMessage(H.BACKGROUND_MEDIA_PLAYING_CHANGED, token, playing ? 1 : 0);
+ public void scheduleBackgroundVisibleBehindChanged(IBinder token, boolean visible) {
+ sendMessage(H.BACKGROUND_VISIBLE_BEHIND_CHANGED, token, visible ? 1 : 0);
}
public void scheduleEnterAnimationComplete(IBinder token) {
@@ -1217,8 +1217,8 @@
public static final int TRANSLUCENT_CONVERSION_COMPLETE = 144;
public static final int INSTALL_PROVIDER = 145;
public static final int ON_NEW_ACTIVITY_OPTIONS = 146;
- public static final int STOP_MEDIA_PLAYING = 147;
- public static final int BACKGROUND_MEDIA_PLAYING_CHANGED = 148;
+ public static final int CANCEL_VISIBLE_BEHIND = 147;
+ public static final int BACKGROUND_VISIBLE_BEHIND_CHANGED = 148;
public static final int ENTER_ANIMATION_COMPLETE = 149;
String codeToString(int code) {
@@ -1270,8 +1270,8 @@
case TRANSLUCENT_CONVERSION_COMPLETE: return "TRANSLUCENT_CONVERSION_COMPLETE";
case INSTALL_PROVIDER: return "INSTALL_PROVIDER";
case ON_NEW_ACTIVITY_OPTIONS: return "ON_NEW_ACTIVITY_OPTIONS";
- case STOP_MEDIA_PLAYING: return "STOP_MEDIA_PLAYING";
- case BACKGROUND_MEDIA_PLAYING_CHANGED: return "BACKGROUND_MEDIA_PLAYING_CHANGED";
+ 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";
}
}
@@ -1491,11 +1491,11 @@
Pair<IBinder, ActivityOptions> pair = (Pair<IBinder, ActivityOptions>) msg.obj;
onNewActivityOptions(pair.first, pair.second);
break;
- case STOP_MEDIA_PLAYING:
- handleStopMediaPlaying((IBinder) msg.obj);
+ case CANCEL_VISIBLE_BEHIND:
+ handleCancelVisibleBehind((IBinder) msg.obj);
break;
- case BACKGROUND_MEDIA_PLAYING_CHANGED:
- handleOnBackgroundMediaPlayingChanged((IBinder) msg.obj, msg.arg1 > 0);
+ case BACKGROUND_VISIBLE_BEHIND_CHANGED:
+ handleOnBackgroundVisibleBehindChanged((IBinder) msg.obj, msg.arg1 > 0);
break;
case ENTER_ANIMATION_COMPLETE:
handleEnterAnimationComplete((IBinder) msg.obj);
@@ -1807,9 +1807,13 @@
}
}
- public void installSystemApplicationInfo(ApplicationInfo info) {
+ public void installSystemApplicationInfo(ApplicationInfo info, ClassLoader classLoader) {
synchronized (this) {
- getSystemContext().installSystemApplicationInfo(info);
+ getSystemContext().installSystemApplicationInfo(info, classLoader);
+
+ // The code package for "android" in the system server needs
+ // to be the system context's package.
+ mPackages.put("android", new WeakReference<LoadedApk>(getSystemContext().mPackageInfo));
// give ourselves a default profiler
mProfiler = new Profiler();
@@ -2488,31 +2492,31 @@
}
}
- public void handleStopMediaPlaying(IBinder token) {
+ public void handleCancelVisibleBehind(IBinder token) {
ActivityClientRecord r = mActivities.get(token);
if (r != null) {
final Activity activity = r.activity;
- if (activity.mMediaPlaying) {
+ if (activity.mVisibleBehind) {
activity.mCalled = false;
- activity.onStopMediaPlaying();
+ activity.onVisibleBehindCancelled();
// Tick, tick, tick. The activity has 500 msec to return or it will be destroyed.
if (!activity.mCalled) {
throw new SuperNotCalledException("Activity " + activity.getLocalClassName() +
- " did not call through to super.onStopMediaPlayback()");
+ " did not call through to super.onVisibleBehindCancelled()");
}
- activity.mMediaPlaying = false;
+ activity.mVisibleBehind = false;
}
}
try {
- ActivityManagerNative.getDefault().mediaResourcesReleased(token);
+ ActivityManagerNative.getDefault().backgroundResourcesReleased(token);
} catch (RemoteException e) {
}
}
- public void handleOnBackgroundMediaPlayingChanged(IBinder token, boolean playing) {
+ public void handleOnBackgroundVisibleBehindChanged(IBinder token, boolean visible) {
ActivityClientRecord r = mActivities.get(token);
if (r != null) {
- r.activity.onBackgroundMediaPlayingChanged(playing);
+ r.activity.onBackgroundVisibleBehindChanged(visible);
}
}
@@ -3490,6 +3494,20 @@
synchronized (mResourcesManager) {
mCoreSettings = coreSettings;
}
+ onCoreSettingsChange();
+ }
+
+ private void onCoreSettingsChange() {
+ boolean debugViewAttributes =
+ mCoreSettings.getInt(Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0;
+ if (debugViewAttributes != View.mDebugViewAttributes) {
+ View.mDebugViewAttributes = debugViewAttributes;
+
+ // request all activities to relaunch for the changes to take place
+ for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
+ requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, false);
+ }
+ }
}
private void handleUpdatePackageCompatibilityInfo(UpdateCompatibilityData data) {
@@ -4320,6 +4338,9 @@
final boolean is24Hr = "24".equals(mCoreSettings.getString(Settings.System.TIME_12_24));
DateFormat.set24HourTimePref(is24Hr);
+ View.mDebugViewAttributes =
+ mCoreSettings.getInt(Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0;
+
/**
* For system applications on userdebug/eng builds, log stack
* traces of disk and network access to dropbox for analysis.
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index f7c0d23..7d2f677 100644
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -239,7 +239,7 @@
return mWindow;
}
- protected ViewGroup getDecor() {
+ public ViewGroup getDecor() {
return (mWindow == null) ? null : (ViewGroup) mWindow.getDecorView();
}
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java
index 4f3b02c..613e248 100644
--- a/core/java/android/app/ActivityTransitionState.java
+++ b/core/java/android/app/ActivityTransitionState.java
@@ -17,9 +17,11 @@
import android.os.Bundle;
import android.os.ResultReceiver;
+import android.transition.Transition;
import android.util.ArrayMap;
import android.util.SparseArray;
import android.view.View;
+import android.view.ViewGroup;
import android.view.Window;
import java.lang.ref.WeakReference;
@@ -245,13 +247,23 @@
} else {
if (!mHasExited) {
mHasExited = true;
+ Transition enterViewsTransition = null;
+ ViewGroup decor = null;
if (mEnterTransitionCoordinator != null) {
+ enterViewsTransition = mEnterTransitionCoordinator.getEnterViewsTransition();
+ decor = mEnterTransitionCoordinator.getDecor();
mEnterTransitionCoordinator.cancelEnter();
mEnterTransitionCoordinator = null;
+ if (enterViewsTransition != null && decor != null) {
+ enterViewsTransition.pause(decor);
+ }
}
ExitTransitionCoordinator exitCoordinator =
new ExitTransitionCoordinator(activity, mEnteringNames, null, null, true);
+ if (enterViewsTransition != null && decor != null) {
+ enterViewsTransition.resume(decor);
+ }
exitCoordinator.startExit(activity.mResultCode, activity.mResultData);
}
return true;
diff --git a/core/java/android/app/AlarmClockInfo.java b/core/java/android/app/AlarmClockInfo.java
deleted file mode 100644
index 0ccaf02..0000000
--- a/core/java/android/app/AlarmClockInfo.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package android.app;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * An immutable description of an alarm clock.
- *
- * @see AlarmManager#setAlarmClock
- * @see AlarmManager#getNextAlarmClock
- */
-public class AlarmClockInfo implements Parcelable {
-
- private final long mTriggerTime;
- private final PendingIntent mShowIntent;
-
- /**
- * Creates a new alarm clock description.
- *
- * @param triggerTime time at which the underlying alarm is triggered in wall time milliseconds
- * since the epoch
- * @param showIntent an intent that can be used to show or edit details of
- * the alarm clock.
- */
- public AlarmClockInfo(long triggerTime, PendingIntent showIntent) {
- mTriggerTime = triggerTime;
- mShowIntent = showIntent;
- }
-
- /**
- * Use the {@link #CREATOR}
- * @hide
- */
- AlarmClockInfo(Parcel in) {
- mTriggerTime = in.readLong();
- mShowIntent = in.readParcelable(PendingIntent.class.getClassLoader());
- }
-
- /**
- * Returns the time at which the alarm is going to trigger.
- *
- * This value is UTC wall clock time in milliseconds, as returned by
- * {@link System#currentTimeMillis()} for example.
- */
- public long getTriggerTime() {
- return mTriggerTime;
- }
-
- /**
- * Returns an intent intent that can be used to show or edit details of the alarm clock in
- * the application that scheduled it.
- *
- * <p class="note">Beware that any application can retrieve and send this intent, potentially
- * with additional fields filled in. See
- * {@link PendingIntent#send(android.content.Context, int, android.content.Intent)
- * PendingIntent.send()} and {@link android.content.Intent#fillIn Intent.fillIn()}
- * for details.
- */
- public PendingIntent getShowIntent() {
- return mShowIntent;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeLong(mTriggerTime);
- dest.writeParcelable(mShowIntent, flags);
- }
-
- public static final Creator<AlarmClockInfo> CREATOR = new Creator<AlarmClockInfo>() {
- @Override
- public AlarmClockInfo createFromParcel(Parcel in) {
- return new AlarmClockInfo(in);
- }
-
- @Override
- public AlarmClockInfo[] newArray(int size) {
- return new AlarmClockInfo[size];
- }
- };
-}
diff --git a/core/java/android/app/AlarmClockInfo.aidl b/core/java/android/app/AlarmManager.aidl
similarity index 93%
rename from core/java/android/app/AlarmClockInfo.aidl
rename to core/java/android/app/AlarmManager.aidl
index 58a3644..c9547b2 100644
--- a/core/java/android/app/AlarmClockInfo.aidl
+++ b/core/java/android/app/AlarmManager.aidl
@@ -16,4 +16,4 @@
package android.app;
-parcelable AlarmClockInfo;
+parcelable AlarmManager.AlarmClockInfo;
diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java
index fa2d64c..a64e0ed 100644
--- a/core/java/android/app/AlarmManager.java
+++ b/core/java/android/app/AlarmManager.java
@@ -20,9 +20,12 @@
import android.content.Context;
import android.content.Intent;
import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.WorkSource;
+import android.os.Parcelable.Creator;
/**
* This class provides access to the system alarm services. These allow you
@@ -579,4 +582,85 @@
return null;
}
}
+
+ /**
+ * An immutable description of an alarm clock.
+ *
+ * @see AlarmManager#setAlarmClock
+ * @see AlarmManager#getNextAlarmClock
+ */
+ public static final class AlarmClockInfo implements Parcelable {
+
+ private final long mTriggerTime;
+ private final PendingIntent mShowIntent;
+
+ /**
+ * Creates a new alarm clock description.
+ *
+ * @param triggerTime time at which the underlying alarm is triggered in wall time
+ * milliseconds since the epoch
+ * @param showIntent an intent that can be used to show or edit details of
+ * the alarm clock.
+ */
+ public AlarmClockInfo(long triggerTime, PendingIntent showIntent) {
+ mTriggerTime = triggerTime;
+ mShowIntent = showIntent;
+ }
+
+ /**
+ * Use the {@link #CREATOR}
+ * @hide
+ */
+ AlarmClockInfo(Parcel in) {
+ mTriggerTime = in.readLong();
+ mShowIntent = in.readParcelable(PendingIntent.class.getClassLoader());
+ }
+
+ /**
+ * Returns the time at which the alarm is going to trigger.
+ *
+ * This value is UTC wall clock time in milliseconds, as returned by
+ * {@link System#currentTimeMillis()} for example.
+ */
+ public long getTriggerTime() {
+ return mTriggerTime;
+ }
+
+ /**
+ * Returns an intent intent that can be used to show or edit details of the alarm clock in
+ * the application that scheduled it.
+ *
+ * <p class="note">Beware that any application can retrieve and send this intent,
+ * potentially with additional fields filled in. See
+ * {@link PendingIntent#send(android.content.Context, int, android.content.Intent)
+ * PendingIntent.send()} and {@link android.content.Intent#fillIn Intent.fillIn()}
+ * for details.
+ */
+ public PendingIntent getShowIntent() {
+ return mShowIntent;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(mTriggerTime);
+ dest.writeParcelable(mShowIntent, flags);
+ }
+
+ public static final Creator<AlarmClockInfo> CREATOR = new Creator<AlarmClockInfo>() {
+ @Override
+ public AlarmClockInfo createFromParcel(Parcel in) {
+ return new AlarmClockInfo(in);
+ }
+
+ @Override
+ public AlarmClockInfo[] newArray(int size) {
+ return new AlarmClockInfo[size];
+ }
+ };
+ }
}
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index a52186a..0d2ad08 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -451,8 +451,8 @@
null, //VIBRATE
null, //READ_CONTACTS
null, //WRITE_CONTACTS
- null, //READ_CALL_LOG
- null, //WRITE_CALL_LOG
+ UserManager.DISALLOW_OUTGOING_CALLS, //READ_CALL_LOG
+ UserManager.DISALLOW_OUTGOING_CALLS, //WRITE_CALL_LOG
null, //READ_CALENDAR
null, //WRITE_CALENDAR
UserManager.DISALLOW_SHARE_LOCATION, //WIFI_SCAN
@@ -1046,7 +1046,10 @@
return packageName + " from uid " + uid + " not allowed to perform " + sOpNames[op];
}
- private int strOpToOp(String op) {
+ /**
+ * {@hide}
+ */
+ public static int strOpToOp(String op) {
Integer val = sOpStrToOp.get(op);
if (val == null) {
throw new IllegalArgumentException("Unknown operation string: " + op);
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index a935dc0..b2812e3 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -1568,7 +1568,7 @@
synchronized (mLock) {
if (mInstaller == null) {
try {
- mInstaller = new PackageInstaller(this, mPM.getPackageInstaller(),
+ mInstaller = new PackageInstaller(mContext, this, mPM.getPackageInstaller(),
mContext.getPackageName(), mContext.getUserId());
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java
index e9d4bd9..52b69e1 100644
--- a/core/java/android/app/ApplicationThreadNative.java
+++ b/core/java/android/app/ApplicationThreadNative.java
@@ -648,21 +648,21 @@
return true;
}
- case STOP_MEDIA_PLAYING_TRANSACTION:
+ case CANCEL_VISIBLE_BEHIND_TRANSACTION:
{
data.enforceInterface(IApplicationThread.descriptor);
IBinder token = data.readStrongBinder();
- scheduleStopMediaPlaying(token);
+ scheduleCancelVisibleBehind(token);
reply.writeNoException();
return true;
}
- case BACKGROUND_MEDIA_PLAYING_CHANGED_TRANSACTION:
+ case BACKGROUND_VISIBLE_BEHIND_CHANGED_TRANSACTION:
{
data.enforceInterface(IApplicationThread.descriptor);
IBinder token = data.readStrongBinder();
boolean enabled = data.readInt() > 0;
- scheduleBackgroundMediaPlayingChanged(token, enabled);
+ scheduleBackgroundVisibleBehindChanged(token, enabled);
reply.writeNoException();
return true;
}
@@ -1334,21 +1334,23 @@
}
@Override
- public void scheduleStopMediaPlaying(IBinder token) throws RemoteException {
+ public void scheduleCancelVisibleBehind(IBinder token) throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);
- mRemote.transact(STOP_MEDIA_PLAYING_TRANSACTION, data, null, IBinder.FLAG_ONEWAY);
+ mRemote.transact(CANCEL_VISIBLE_BEHIND_TRANSACTION, data, null, IBinder.FLAG_ONEWAY);
data.recycle();
}
@Override
- public void scheduleBackgroundMediaPlayingChanged(IBinder token, boolean enabled) throws RemoteException {
+ public void scheduleBackgroundVisibleBehindChanged(IBinder token, boolean enabled)
+ throws RemoteException {
Parcel data = Parcel.obtain();
data.writeInterfaceToken(IApplicationThread.descriptor);
data.writeStrongBinder(token);
data.writeInt(enabled ? 1 : 0);
- mRemote.transact(BACKGROUND_MEDIA_PLAYING_CHANGED_TRANSACTION, data, null, IBinder.FLAG_ONEWAY);
+ mRemote.transact(BACKGROUND_VISIBLE_BEHIND_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 4cf8cb4..da343ac 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2301,8 +2301,8 @@
}
}
- void installSystemApplicationInfo(ApplicationInfo info) {
- mPackageInfo.installSystemApplicationInfo(info);
+ void installSystemApplicationInfo(ApplicationInfo info, ClassLoader classLoader) {
+ mPackageInfo.installSystemApplicationInfo(info, classLoader);
}
final void scheduleFinalCleanup(String who, String what) {
diff --git a/core/java/android/app/DatePickerDialog.java b/core/java/android/app/DatePickerDialog.java
index a78b137..1e556d6 100644
--- a/core/java/android/app/DatePickerDialog.java
+++ b/core/java/android/app/DatePickerDialog.java
@@ -24,8 +24,10 @@
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.Button;
import android.widget.DatePicker;
import android.widget.DatePicker.OnDateChangedListener;
+import android.widget.DatePicker.ValidationCallback;
import com.android.internal.R;
@@ -49,7 +51,6 @@
private final Calendar mCalendar;
private boolean mTitleNeedsUpdate = true;
- private boolean mIsCanceled = false;
/**
* The callback used to indicate the user is done filling in the date.
@@ -83,7 +84,7 @@
static int resolveDialogTheme(Context context, int resid) {
if (resid == 0) {
- TypedValue outValue = new TypedValue();
+ final TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.datePickerDialogTheme, outValue, true);
return outValue.resourceId;
} else {
@@ -99,68 +100,41 @@
* @param monthOfYear The initial month of the dialog.
* @param dayOfMonth The initial day of the dialog.
*/
- public DatePickerDialog(Context context,
- int theme,
- OnDateSetListener listener,
- int year,
- int monthOfYear,
- int dayOfMonth) {
+ public DatePickerDialog(Context context, int theme, OnDateSetListener listener, int year,
+ int monthOfYear, int dayOfMonth) {
super(context, resolveDialogTheme(context, theme));
mDateSetListener = listener;
mCalendar = Calendar.getInstance();
- Context themeContext = getContext();
-
- final LayoutInflater inflater = (LayoutInflater) themeContext.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
+ final Context themeContext = getContext();
+ final LayoutInflater inflater = LayoutInflater.from(themeContext);
final View view = inflater.inflate(R.layout.date_picker_dialog, null);
setView(view);
+ setButton(BUTTON_POSITIVE, themeContext.getString(R.string.ok), this);
+ setButton(BUTTON_NEGATIVE, themeContext.getString(R.string.cancel), this);
setButtonPanelLayoutHint(LAYOUT_HINT_SIDE);
- // Initialize state
mDatePicker = (DatePicker) view.findViewById(R.id.datePicker);
- mDatePicker.setShowDoneButton(true);
- mDatePicker.setDismissCallback(new DatePicker.DatePickerDismissCallback() {
- @Override
- public void dismiss(DatePicker view, boolean isCancel, int year, int month, int dayOfMonth) {
- mIsCanceled = isCancel;
- if (!isCancel) {
- mDateSetListener.onDateSet(view, year, month, dayOfMonth);
- }
- DatePickerDialog.this.dismiss();
- }
- });
mDatePicker.init(year, monthOfYear, dayOfMonth, this);
- }
-
- public void onClick(DialogInterface dialog, int which) {
- tryNotifyDateSet();
+ mDatePicker.setValidationCallback(mValidationCallback);
}
@Override
- public void cancel() {
- mIsCanceled = true;
- super.cancel();
- }
-
- @Override
- protected void onStop() {
- tryNotifyDateSet();
- super.onStop();
- }
-
- public void onDateChanged(DatePicker view, int year,
- int month, int day) {
+ public void onDateChanged(DatePicker view, int year, int month, int day) {
mDatePicker.init(year, month, day, this);
updateTitle(year, month, day);
}
- private void tryNotifyDateSet() {
- if (mDateSetListener != null && !mIsCanceled) {
- mDatePicker.clearFocus();
- mDateSetListener.onDateSet(mDatePicker, mDatePicker.getYear(),
- mDatePicker.getMonth(), mDatePicker.getDayOfMonth());
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case BUTTON_POSITIVE:
+ if (mDateSetListener != null) {
+ mDateSetListener.onDateSet(mDatePicker, mDatePicker.getYear(),
+ mDatePicker.getMonth(), mDatePicker.getDayOfMonth());
+ }
+ break;
}
}
@@ -208,7 +182,7 @@
@Override
public Bundle onSaveInstanceState() {
- Bundle state = super.onSaveInstanceState();
+ final Bundle state = super.onSaveInstanceState();
state.putInt(YEAR, mDatePicker.getYear());
state.putInt(MONTH, mDatePicker.getMonth());
state.putInt(DAY, mDatePicker.getDayOfMonth());
@@ -218,9 +192,19 @@
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
- int year = savedInstanceState.getInt(YEAR);
- int month = savedInstanceState.getInt(MONTH);
- int day = savedInstanceState.getInt(DAY);
+ final int year = savedInstanceState.getInt(YEAR);
+ final int month = savedInstanceState.getInt(MONTH);
+ final int day = savedInstanceState.getInt(DAY);
mDatePicker.init(year, month, day, this);
}
+
+ private final ValidationCallback mValidationCallback = new ValidationCallback() {
+ @Override
+ public void onValidationChanged(boolean valid) {
+ final Button positive = getButton(BUTTON_POSITIVE);
+ if (positive != null) {
+ positive.setEnabled(valid);
+ }
+ }
+ };
}
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 54c5bc4..75ecbd9 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -59,6 +59,7 @@
private boolean mIsViewsTransitionComplete;
private boolean mIsSharedElementTransitionComplete;
private ArrayList<Matrix> mSharedElementParentMatrices;
+ private Transition mEnterViewsTransition;
public EnterTransitionCoordinator(Activity activity, ResultReceiver resultReceiver,
ArrayList<String> sharedElementNames, boolean isReturning) {
@@ -104,6 +105,10 @@
triggerViewsReady(mapNamedElements(accepted, localNames));
}
+ public Transition getEnterViewsTransition() {
+ return mEnterViewsTransition;
+ }
+
@Override
protected void viewsReady(ArrayMap<String, View> sharedElements) {
super.viewsReady(sharedElements);
@@ -399,10 +404,17 @@
viewTransitionComplete();
} else {
viewsTransition.forceVisibility(View.INVISIBLE, true);
- setTransitionAlpha(mTransitioningViews, 1);
viewsTransition.addListener(new ContinueTransitionListener() {
@Override
+ public void onTransitionStart(Transition transition) {
+ mEnterViewsTransition = transition;
+ setTransitionAlpha(mTransitioningViews, 1);
+ super.onTransitionStart(transition);
+ }
+
+ @Override
public void onTransitionEnd(Transition transition) {
+ mEnterViewsTransition = null;
transition.removeListener(this);
viewTransitionComplete();
super.onTransitionEnd(transition);
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 772e132..8e21899 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -68,6 +68,10 @@
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int flags, String profileFile,
ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException;
+ public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo, String resultWho,
+ int requestCode, int flags, String profileFile,
+ ParcelFileDescriptor profileFd, Bundle options) throws RemoteException;
public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int flags, String profileFile,
@@ -383,7 +387,7 @@
public void showBootMessage(CharSequence msg, boolean always) throws RemoteException;
- public void dismissKeyguardOnNextActivity() throws RemoteException;
+ public void keyguardWaitingForActivityDrawn() throws RemoteException;
public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity)
throws RemoteException;
@@ -443,9 +447,9 @@
public void setTaskDescription(IBinder token, ActivityManager.TaskDescription values)
throws RemoteException;
- public boolean setMediaPlaying(IBinder token, boolean playing) throws RemoteException;
- public boolean isBackgroundMediaPlaying(IBinder token) throws RemoteException;
- public void mediaResourcesReleased(IBinder token) throws RemoteException;
+ public boolean requestVisibleBehind(IBinder token, boolean visible) throws RemoteException;
+ public boolean isBackgroundVisibleBehind(IBinder token) throws RemoteException;
+ public void backgroundResourcesReleased(IBinder token) throws RemoteException;
public void notifyLaunchTaskBehindComplete(IBinder token) throws RemoteException;
public void notifyEnterAnimationComplete(IBinder token) throws RemoteException;
@@ -688,7 +692,6 @@
int UPDATE_PERSISTENT_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+135;
int GET_PROCESS_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+136;
int SHOW_BOOT_MESSAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+137;
- int DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+138;
int KILL_ALL_BACKGROUND_PROCESSES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+139;
int GET_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+140;
int REMOVE_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+141;
@@ -754,10 +757,12 @@
int STOP_LOCK_TASK_BY_CURRENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+222;
int FINISH_VOICE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+223;
int IS_TOP_OF_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+224;
- int SET_MEDIA_PLAYING_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+225;
- int IS_BG_MEDIA_PLAYING_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+226;
- int MEDIA_RESOURCES_RELEASED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+227;
+ int REQUEST_VISIBLE_BEHIND_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+225;
+ int IS_BACKGROUND_VISIBLE_BEHIND_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+226;
+ int BACKGROUND_RESOURCES_RELEASED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+227;
int NOTIFY_LAUNCH_TASK_BEHIND_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+228;
int START_ACTIVITY_FROM_RECENTS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 229;
int NOTIFY_ENTER_ANIMATION_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+230;
+ int KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+231;
+ int START_ACTIVITY_AS_CALLER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+232;
}
diff --git a/core/java/android/app/IAlarmManager.aidl b/core/java/android/app/IAlarmManager.aidl
index fb33706..194082e 100644
--- a/core/java/android/app/IAlarmManager.aidl
+++ b/core/java/android/app/IAlarmManager.aidl
@@ -16,7 +16,7 @@
*/
package android.app;
-import android.app.AlarmClockInfo;
+import android.app.AlarmManager;
import android.app.PendingIntent;
import android.os.WorkSource;
@@ -29,11 +29,11 @@
/** windowLength == 0 means exact; windowLength < 0 means the let the OS decide */
void set(int type, long triggerAtTime, long windowLength,
long interval, in PendingIntent operation, in WorkSource workSource,
- in AlarmClockInfo alarmClock);
+ in AlarmManager.AlarmClockInfo alarmClock);
boolean setTime(long millis);
void setTimeZone(String zone);
void remove(in PendingIntent operation);
- AlarmClockInfo getNextAlarmClock(int userId);
+ AlarmManager.AlarmClockInfo getNextAlarmClock(int userId);
}
diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java
index 4a1fda4..01b6fdf 100644
--- a/core/java/android/app/IApplicationThread.java
+++ b/core/java/android/app/IApplicationThread.java
@@ -145,8 +145,8 @@
void setProcessState(int state) throws RemoteException;
void scheduleInstallProvider(ProviderInfo provider) throws RemoteException;
void updateTimePrefs(boolean is24Hour) throws RemoteException;
- void scheduleStopMediaPlaying(IBinder token) throws RemoteException;
- void scheduleBackgroundMediaPlayingChanged(IBinder token, boolean enabled) throws RemoteException;
+ void scheduleCancelVisibleBehind(IBinder token) throws RemoteException;
+ void scheduleBackgroundVisibleBehindChanged(IBinder token, boolean enabled) throws RemoteException;
void scheduleEnterAnimationComplete(IBinder token) throws RemoteException;
String descriptor = "android.app.IApplicationThread";
@@ -202,7 +202,7 @@
int SET_PROCESS_STATE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+49;
int SCHEDULE_INSTALL_PROVIDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+50;
int UPDATE_TIME_PREFS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+51;
- int STOP_MEDIA_PLAYING_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+52;
- int BACKGROUND_MEDIA_PLAYING_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+53;
+ int CANCEL_VISIBLE_BEHIND_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+52;
+ int BACKGROUND_VISIBLE_BEHIND_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+53;
int ENTER_ANIMATION_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+54;
}
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index 4b65934..e8f6818 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -66,7 +66,7 @@
boolean setZenModeConfig(in ZenModeConfig config);
oneway void notifyConditions(String pkg, in IConditionProvider provider, in Condition[] conditions);
oneway void requestZenModeConditions(in IConditionListener callback, int relevance);
- oneway void setZenModeCondition(in Uri conditionId);
+ oneway void setZenModeCondition(in Condition condition);
oneway void setAutomaticZenModeConditions(in Uri[] conditionIds);
Condition[] getAutomaticZenModeConditions();
}
\ No newline at end of file
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index c583998..b28d7cc 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -1665,6 +1665,43 @@
return null;
}
+ /**
+ * Special version!
+ * @hide
+ */
+ public ActivityResult execStartActivityAsCaller(
+ Context who, IBinder contextThread, IBinder token, Activity target,
+ Intent intent, int requestCode, Bundle options) {
+ IApplicationThread whoThread = (IApplicationThread) contextThread;
+ if (mActivityMonitors != null) {
+ synchronized (mSync) {
+ final int N = mActivityMonitors.size();
+ for (int i=0; i<N; i++) {
+ final ActivityMonitor am = mActivityMonitors.get(i);
+ if (am.match(who, null, intent)) {
+ am.mHits++;
+ if (am.isBlocking()) {
+ return requestCode >= 0 ? am.getResult() : null;
+ }
+ break;
+ }
+ }
+ }
+ }
+ try {
+ intent.migrateExtraStreamToClipData();
+ intent.prepareToLeaveProcess();
+ int result = ActivityManagerNative.getDefault()
+ .startActivityAsCaller(whoThread, who.getBasePackageName(), intent,
+ intent.resolveTypeIfNeeded(who.getContentResolver()),
+ token, target != null ? target.mEmbeddedID : null,
+ requestCode, 0, null, null, options);
+ checkStartActivityResult(result, intent);
+ } catch (RemoteException e) {
+ }
+ return null;
+ }
+
/*package*/ final void init(ActivityThread thread,
Context instrContext, Context appContext, ComponentName component,
IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection) {
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index db91742a..50e3a10 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -16,6 +16,7 @@
package android.app;
+import android.content.Intent;
import android.os.Binder;
import android.os.RemoteException;
import android.os.IBinder;
@@ -24,7 +25,7 @@
import android.view.WindowManagerGlobal;
/**
- * Class that can be used to lock and unlock the keyboard. Get an instance of this
+ * Class that can be used to lock and unlock the keyboard. Get an instance of this
* class by calling {@link android.content.Context#getSystemService(java.lang.String)}
* with argument {@link android.content.Context#KEYGUARD_SERVICE}. The
* actual class to control the keyboard locking is
@@ -34,6 +35,45 @@
private IWindowManager mWM;
/**
+ * Intent used to prompt user for device credentials.
+ * @hide
+ */
+ public static final String ACTION_CONFIRM_DEVICE_CREDENTIAL =
+ "android.app.action.CONFIRM_DEVICE_CREDENTIAL";
+
+ /**
+ * A CharSequence dialog title to show to the user when used with a
+ * {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
+ * @hide
+ */
+ public static final String EXTRA_TITLE = "android.app.extra.TITLE";
+
+ /**
+ * A CharSequence description to show to the user when used with
+ * {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
+ * @hide
+ */
+ public static final String EXTRA_DESCRIPTION = "android.app.extra.DESCRIPTION";
+
+ /**
+ * Get an intent to prompt the user to confirm credentials (pin, pattern or password)
+ * for the current user of the device. The caller is expected to launch this activity using
+ * {@link android.app.Activity#startActivityForResult(Intent, int)} and check for
+ * {@link android.app.Activity#RESULT_OK} if the user successfully completes the challenge.
+ *
+ * @return the intent for launching the activity or null if no password is required.
+ **/
+ public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
+ if (!isKeyguardSecure()) return null;
+ Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
+ intent.putExtra(EXTRA_TITLE, title);
+ intent.putExtra(EXTRA_DESCRIPTION, description);
+ // For security reasons, only allow this to come from system settings.
+ intent.setPackage("com.android.settings");
+ return intent;
+ }
+
+ /**
* @deprecated Use {@link android.view.WindowManager.LayoutParams#FLAG_DISMISS_KEYGUARD}
* and/or {@link android.view.WindowManager.LayoutParams#FLAG_SHOW_WHEN_LOCKED}
* instead; this allows you to seamlessly hide the keyguard as your application
@@ -58,7 +98,7 @@
*
* A good place to call this is from {@link android.app.Activity#onResume()}
*
- * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
+ * Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
* is enabled that requires a password.
*
* <p>This method requires the caller to hold the permission
@@ -121,7 +161,7 @@
* permissions be requested.
*
* Enables you to lock or unlock the keyboard. Get an instance of this class by
- * calling {@link android.content.Context#getSystemService(java.lang.String) Context.getSystemService()}.
+ * calling {@link android.content.Context#getSystemService(java.lang.String) Context.getSystemService()}.
* This class is wrapped by {@link android.app.KeyguardManager KeyguardManager}.
* @param tag A tag that informally identifies who you are (for debugging who
* is disabling he keyguard).
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index 24c2835..e0c7816 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -40,6 +40,7 @@
import android.os.Trace;
import android.os.UserHandle;
import android.util.AndroidRuntimeException;
+import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
import android.view.DisplayAdjustments;
@@ -199,9 +200,10 @@
/**
* Sets application info about the system package.
*/
- void installSystemApplicationInfo(ApplicationInfo info) {
+ void installSystemApplicationInfo(ApplicationInfo info, ClassLoader classLoader) {
assert info.packageName.equals("android");
mApplicationInfo = info;
+ mClassLoader = classLoader;
}
public String getPackageName() {
@@ -262,10 +264,6 @@
if (!Objects.equals(mPackageName, ActivityThread.currentPackageName())) {
final String isa = VMRuntime.getRuntime().vmInstructionSet();
try {
- // TODO: We can probably do away with the isa argument since
- // the AM and PM have enough information to figure this out
- // themselves. If we do need it, we should match it against the
- // list of devices ISAs before sending it down to installd.
ActivityThread.getPackageManager().performDexOptIfNeeded(mPackageName, isa);
} catch (RemoteException re) {
// Ignored.
@@ -646,8 +644,17 @@
}
private void rewriteRValues(ClassLoader cl, String packageName, int id) {
+ final Class<?> rClazz;
try {
- final Class<?> rClazz = cl.loadClass(packageName + ".R");
+ rClazz = cl.loadClass(packageName + ".R");
+ } catch (ClassNotFoundException e) {
+ // This is not necessarily an error, as some packages do not ship with resources
+ // (or they do not need rewriting).
+ Log.i(TAG, "Could not find R class for package '" + packageName + "'");
+ return;
+ }
+
+ try {
Class<?>[] declaredClasses = rClazz.getDeclaredClasses();
for (Class<?> clazz : declaredClasses) {
try {
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 90b8b86..70ba8ea 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -279,6 +279,7 @@
*
* @deprecated Use {@link #audioAttributes} instead.
*/
+ @Deprecated
public static final int STREAM_DEFAULT = -1;
/**
@@ -288,6 +289,7 @@
*
* @deprecated Use {@link #audioAttributes} instead.
*/
+ @Deprecated
public int audioStreamType = STREAM_DEFAULT;
/**
@@ -1605,6 +1607,7 @@
builder.setPriority(this.priority);
builder.setTicker(this.tickerText);
builder.setNumber(this.number);
+ builder.setColor(this.color);
builder.mFlags = this.flags;
builder.setSound(this.sound, this.audioStreamType);
builder.setDefaults(this.defaults);
@@ -2193,6 +2196,7 @@
* @deprecated use {@link #setSound(Uri, AudioAttributes)} instead.
* @see Notification#sound
*/
+ @Deprecated
public Builder setSound(Uri sound, int streamType) {
mSound = sound;
mAudioStreamType = streamType;
@@ -2574,9 +2578,21 @@
}
private RemoteViews applyStandardTemplate(int resId, boolean fitIn1U) {
+ final boolean largeFontScale
+ = mContext.getResources().getConfiguration().fontScale >= 1.25f;
+
Bitmap profileIcon = getProfileBadge();
RemoteViews contentView = new BuilderRemoteViews(mContext.getPackageName(),
mOriginatingUserId, resId);
+
+ if (largeFontScale) {
+ // Make a little extra room for the bigger text.
+ final int margin = (int) mContext.getResources()
+ .getDimensionPixelSize(R.dimen.notification_large_font_vert_pad);
+ contentView.setViewPadding(R.id.line1, 0, margin, 0, 0);
+ contentView.setViewPadding(R.id.line3, 0, 0, 0, margin);
+ }
+
boolean showLine3 = false;
boolean showLine2 = false;
@@ -3218,7 +3234,7 @@
}
private int getBigTextLayoutResource() {
- return R.layout.notification_template_material_big_text;
+ return getBigBaseLayoutResource();
}
private int getInboxLayoutResource() {
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 3c13115..1691d8e 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -178,8 +178,13 @@
//}
AssetManager assets = new AssetManager();
- if (assets.addAssetPath(resDir) == 0) {
- return null;
+ // resDir can be null if the 'android' package is creating a new Resources object.
+ // This is fine, since each AssetManager automatically loads the 'android' package
+ // already.
+ if (resDir != null) {
+ if (assets.addAssetPath(resDir) == 0) {
+ return null;
+ }
}
if (splitResDirs != null) {
diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index a2f3050..6454367 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
-import android.os.Build;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.Button;
import android.widget.TimePicker;
import android.widget.TimePicker.OnTimeChangedListener;
+import android.widget.TimePicker.ValidationCallback;
import com.android.internal.R;
@@ -35,8 +36,19 @@
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
* guide.</p>
*/
-public class TimePickerDialog extends AlertDialog
- implements OnClickListener, OnTimeChangedListener {
+public class TimePickerDialog extends AlertDialog implements OnClickListener,
+ OnTimeChangedListener {
+
+ private static final String HOUR = "hour";
+ private static final String MINUTE = "minute";
+ private static final String IS_24_HOUR = "is24hour";
+
+ private final TimePicker mTimePicker;
+ private final OnTimeSetListener mTimeSetCallback;
+
+ private final int mInitialHourOfDay;
+ private final int mInitialMinute;
+ private final boolean mIs24HourView;
/**
* The callback interface used to indicate the user is done filling in
@@ -52,19 +64,6 @@
void onTimeSet(TimePicker view, int hourOfDay, int minute);
}
- private static final String HOUR = "hour";
- private static final String MINUTE = "minute";
- private static final String IS_24_HOUR = "is24hour";
-
- private final TimePicker mTimePicker;
- private final OnTimeSetListener mTimeSetCallback;
-
- int mInitialHourOfDay;
- int mInitialMinute;
- boolean mIs24HourView;
-
- private boolean mIsCanceled;
-
/**
* @param context Parent.
* @param callBack How parent is notified.
@@ -80,7 +79,7 @@
static int resolveDialogTheme(Context context, int resid) {
if (resid == 0) {
- TypedValue outValue = new TypedValue();
+ final TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.timePickerDialogTheme, outValue, true);
return outValue.resourceId;
} else {
@@ -96,10 +95,8 @@
* @param minute The initial minute.
* @param is24HourView Whether this is a 24 hour view, or AM/PM.
*/
- public TimePickerDialog(Context context,
- int theme,
- OnTimeSetListener callBack,
- int hourOfDay, int minute, boolean is24HourView) {
+ public TimePickerDialog(Context context, int theme, OnTimeSetListener callBack, int hourOfDay,
+ int minute, boolean is24HourView) {
super(context, resolveDialogTheme(context, theme));
mTimeSetCallback = callBack;
@@ -108,72 +105,52 @@
mIs24HourView = is24HourView;
final Context themeContext = getContext();
-
- final int targetSdkVersion = themeContext.getApplicationInfo().targetSdkVersion;
- if (targetSdkVersion < Build.VERSION_CODES.L) {
- setIcon(0);
- setTitle(R.string.time_picker_dialog_title);
- }
-
final LayoutInflater inflater = LayoutInflater.from(themeContext);
final View view = inflater.inflate(R.layout.time_picker_dialog, null);
setView(view);
+ setButton(BUTTON_POSITIVE, themeContext.getString(R.string.ok), this);
+ setButton(BUTTON_NEGATIVE, themeContext.getString(R.string.cancel), this);
+ setButtonPanelLayoutHint(LAYOUT_HINT_SIDE);
mTimePicker = (TimePicker) view.findViewById(R.id.timePicker);
- mTimePicker.setShowDoneButton(true);
- // If time picker layout has no done button, add a dialog button.
- if (!mTimePicker.isShowDoneButton()) {
- setButton(BUTTON_POSITIVE, themeContext.getText(R.string.date_time_done), this);
- }
-
- mTimePicker.setDismissCallback(new TimePicker.TimePickerDismissCallback() {
- @Override
- public void dismiss(TimePicker view, boolean isCancel, int hourOfDay, int minute) {
- mIsCanceled = isCancel;
- if (!isCancel) {
- mTimeSetCallback.onTimeSet(view, hourOfDay, minute);
- TimePickerDialog.this.dismiss();
- } else {
- TimePickerDialog.this.cancel();
- }
- }
- });
mTimePicker.setIs24HourView(mIs24HourView);
mTimePicker.setCurrentHour(mInitialHourOfDay);
mTimePicker.setCurrentMinute(mInitialMinute);
mTimePicker.setOnTimeChangedListener(this);
+ mTimePicker.setValidationCallback(mValidationCallback);
}
- public void onClick(DialogInterface dialog, int which) {
- tryNotifyTimeSet();
- }
-
- public void updateTime(int hourOfDay, int minutOfHour) {
- mTimePicker.setCurrentHour(hourOfDay);
- mTimePicker.setCurrentMinute(minutOfHour);
- }
-
+ @Override
public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
/* do nothing */
}
- private void tryNotifyTimeSet() {
- if (mTimeSetCallback != null && !mIsCanceled) {
- mTimePicker.clearFocus();
- mTimeSetCallback.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
- mTimePicker.getCurrentMinute());
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case BUTTON_POSITIVE:
+ if (mTimeSetCallback != null) {
+ mTimeSetCallback.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
+ mTimePicker.getCurrentMinute());
+ }
+ break;
}
}
- @Override
- protected void onStop() {
- tryNotifyTimeSet();
- super.onStop();
+ /**
+ * Sets the current time.
+ *
+ * @param hourOfDay The current hour within the day.
+ * @param minuteOfHour The current minute within the hour.
+ */
+ public void updateTime(int hourOfDay, int minuteOfHour) {
+ mTimePicker.setCurrentHour(hourOfDay);
+ mTimePicker.setCurrentMinute(minuteOfHour);
}
@Override
public Bundle onSaveInstanceState() {
- Bundle state = super.onSaveInstanceState();
+ final Bundle state = super.onSaveInstanceState();
state.putInt(HOUR, mTimePicker.getCurrentHour());
state.putInt(MINUTE, mTimePicker.getCurrentMinute());
state.putBoolean(IS_24_HOUR, mTimePicker.is24HourView());
@@ -183,10 +160,20 @@
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
- int hour = savedInstanceState.getInt(HOUR);
- int minute = savedInstanceState.getInt(MINUTE);
+ final int hour = savedInstanceState.getInt(HOUR);
+ final int minute = savedInstanceState.getInt(MINUTE);
mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));
mTimePicker.setCurrentHour(hour);
mTimePicker.setCurrentMinute(minute);
}
+
+ private final ValidationCallback mValidationCallback = new ValidationCallback() {
+ @Override
+ public void onValidationChanged(boolean valid) {
+ final Button positive = getButton(BUTTON_POSITIVE);
+ if (positive != null) {
+ positive.setEnabled(valid);
+ }
+ }
+ };
}
diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java
index f79eb04..0a255f7 100644
--- a/core/java/android/app/UiModeManager.java
+++ b/core/java/android/app/UiModeManager.java
@@ -125,15 +125,15 @@
public static final int ENABLE_CAR_MODE_GO_CAR_HOME = 0x0001;
/**
- * Flag for use with {@link #enableCarMode(int)}: do not hold full wake lock
- * while in car mode. By default, when this flag is not set, the system may hold
- * a full wake lock to keep the screen turned on while in car mode.
- * Setting this flag disables such behavior and the screen may be turned off if
- * there is no other user activity and no other full wake lock held.
+ * Flag for use with {@link #enableCarMode(int)}: allow sleep mode while in car mode.
+ * By default, when this flag is not set, the system may hold a full wake lock to keep the
+ * screen turned on and prevent the system from entering sleep mode while in car mode.
+ * Setting this flag disables such behavior and the system may enter sleep mode
+ * if there is no other user activity and no other wake lock held.
* Setting this flag can be relevant for a car dock application that does not require the
* screen kept on.
*/
- public static final int ENABLE_CAR_MODE_NO_WAKE_LOCK = 0x0002;
+ public static final int ENABLE_CAR_MODE_ALLOW_SLEEP = 0x0002;
/**
* Force device into car mode, like it had been placed in the car dock.
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java
index 1f168c3..15def09 100644
--- a/core/java/android/app/admin/DeviceAdminReceiver.java
+++ b/core/java/android/app/admin/DeviceAdminReceiver.java
@@ -167,28 +167,30 @@
/**
* Action sent to a device administrator to notify that the device is entering
- * or exiting lock task mode from an authorized package. The extra
- * {@link #EXTRA_LOCK_TASK_ENTERING} will describe whether entering or exiting
- * the mode. If entering, the extra {@link #EXTRA_LOCK_TASK_PACKAGE} will describe
- * the authorized package using lock task mode.
+ * lock task mode from an authorized package. The extra {@link #EXTRA_LOCK_TASK_PACKAGE}
+ * will describe the authorized package using lock task mode.
*
- * @see DevicePolicyManager#isLockTaskPermitted
+ * @see DevicePolicyManager#isLockTaskPermitted(String)
*
* <p>The calling device admin must be the device owner or profile
* owner to receive this broadcast.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
- public static final String ACTION_LOCK_TASK_CHANGED
- = "android.app.action.ACTION_LOCK_TASK_CHANGED";
+ public static final String ACTION_LOCK_TASK_ENTERING
+ = "android.app.action.ACTION_LOCK_TASK_ENTERING";
/**
- * A boolean describing whether the device is currently entering or exiting
- * lock task mode.
+ * Action sent to a device administrator to notify that the device is exiting
+ * lock task mode from an authorized package.
*
- * @see #ACTION_LOCK_TASK_CHANGED
+ * @see DevicePolicyManager#isLockTaskPermitted(String)
+ *
+ * <p>The calling device admin must be the device owner or profile
+ * owner to receive this broadcast.
*/
- public static final String EXTRA_LOCK_TASK_ENTERING =
- "android.app.extra.LOCK_TASK_ENTERING";
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String ACTION_LOCK_TASK_EXITING
+ = "android.app.action.ACTION_LOCK_TASK_EXITING";
/**
* A boolean describing whether the device is currently entering or exiting
@@ -380,16 +382,24 @@
}
/**
- * Called when a device is entering or exiting lock task mode by a package
- * authorized by {@link DevicePolicyManager#isLockTaskPermitted(String)}
+ * Called when a device is entering lock task mode by a package authorized
+ * by {@link DevicePolicyManager#isLockTaskPermitted(String)}
*
* @param context The running context as per {@link #onReceive}.
* @param intent The received intent as per {@link #onReceive}.
- * @param isEnteringLockTask Whether the device is entering or exiting lock task mode.
* @param pkg If entering, the authorized package using lock task mode, otherwise null.
*/
- public void onLockTaskModeChanged(Context context, Intent intent, boolean isEnteringLockTask,
- String pkg) {
+ public void onLockTaskModeEntering(Context context, Intent intent, String pkg) {
+ }
+
+ /**
+ * Called when a device is exiting lock task mode by a package authorized
+ * by {@link DevicePolicyManager#isLockTaskPermitted(String)}
+ *
+ * @param context The running context as per {@link #onReceive}.
+ * @param intent The received intent as per {@link #onReceive}.
+ */
+ public void onLockTaskModeExiting(Context context, Intent intent) {
}
/**
@@ -421,10 +431,11 @@
onPasswordExpiring(context, intent);
} else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {
onProfileProvisioningComplete(context, intent);
- } else if (ACTION_LOCK_TASK_CHANGED.equals(action)) {
- boolean isEntering = intent.getBooleanExtra(EXTRA_LOCK_TASK_ENTERING, false);
+ } else if (ACTION_LOCK_TASK_ENTERING.equals(action)) {
String pkg = intent.getStringExtra(EXTRA_LOCK_TASK_PACKAGE);
- onLockTaskModeChanged(context, intent, isEntering, pkg);
+ onLockTaskModeEntering(context, intent, pkg);
+ } else if (ACTION_LOCK_TASK_EXITING.equals(action)) {
+ onLockTaskModeExiting(context, intent);
}
}
}
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 5350d70..053afb7 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -21,7 +21,6 @@
import android.annotation.SystemApi;
import android.app.Activity;
import android.app.admin.IDevicePolicyManager;
-import android.content.AbstractRestrictionsProvider;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -39,6 +38,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.service.restrictions.RestrictionsReceiver;
import android.util.Log;
import com.android.org.conscrypt.TrustedCertificateStore;
@@ -2943,15 +2943,17 @@
*
* This function can only be called by the device owner.
* @param packages The list of packages allowed to enter lock task mode
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
*
* @see Activity#startLockTask()
* @see DeviceAdminReceiver#onLockTaskModeChanged(Context, Intent, boolean, String)
* @see UserManager#DISALLOW_CREATE_WINDOWS
*/
- public void setLockTaskPackages(String[] packages) throws SecurityException {
+ public void setLockTaskPackages(ComponentName admin, String[] packages)
+ throws SecurityException {
if (mService != null) {
try {
- mService.setLockTaskPackages(packages);
+ mService.setLockTaskPackages(admin, packages);
} catch (RemoteException e) {
Log.w(TAG, "Failed talking with device policy service", e);
}
@@ -2960,12 +2962,14 @@
/**
* This function returns the list of packages allowed to start the lock task mode.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @hide
*/
- public String[] getLockTaskPackages() {
+ public String[] getLockTaskPackages(ComponentName admin) {
if (mService != null) {
try {
- return mService.getLockTaskPackages();
+ return mService.getLockTaskPackages(admin);
} catch (RemoteException e) {
Log.w(TAG, "Failed talking with device policy service", e);
}
@@ -3033,7 +3037,7 @@
* Only a profile owner can designate the restrictions provider.
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param provider The component name of the service that implements
- * {@link AbstractRestrictionsProvider}. If this param is null,
+ * {@link RestrictionsReceiver}. If this param is null,
* it removes the restrictions provider previously assigned.
*/
public void setRestrictionsProvider(ComponentName admin, ComponentName provider) {
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 8954c0d..324b963 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -153,8 +153,8 @@
String[] getAccountTypesWithManagementDisabled();
String[] getAccountTypesWithManagementDisabledAsUser(int userId);
- void setLockTaskPackages(in String[] packages);
- String[] getLockTaskPackages();
+ void setLockTaskPackages(in ComponentName who, in String[] packages);
+ String[] getLockTaskPackages(in ComponentName who);
boolean isLockTaskPermitted(in String pkg);
void setGlobalSetting(in ComponentName who, in String setting, in String value);
diff --git a/core/java/android/app/backup/BackupDataInput.java b/core/java/android/app/backup/BackupDataInput.java
index 03205fb..26f9e3e 100644
--- a/core/java/android/app/backup/BackupDataInput.java
+++ b/core/java/android/app/backup/BackupDataInput.java
@@ -16,6 +16,8 @@
package android.app.backup;
+import android.annotation.SystemApi;
+
import java.io.FileDescriptor;
import java.io.IOException;
@@ -70,6 +72,7 @@
}
/** @hide */
+ @SystemApi
public BackupDataInput(FileDescriptor fd) {
if (fd == null) throw new NullPointerException();
mBackupReader = ctor(fd);
@@ -79,6 +82,7 @@
}
/** @hide */
+ @Override
protected void finalize() throws Throwable {
try {
dtor(mBackupReader);
@@ -174,7 +178,7 @@
* for further processing. This allows a {@link android.app.backup.BackupAgent} to
* efficiently discard obsolete or otherwise uninteresting records during the
* restore operation.
- *
+ *
* @throws IOException if an error occurred when trying to read the restore data stream
*/
public void skipEntityData() throws IOException {
diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java
index fc5fb3d..048a4bb 100644
--- a/core/java/android/app/backup/BackupDataOutput.java
+++ b/core/java/android/app/backup/BackupDataOutput.java
@@ -16,6 +16,7 @@
package android.app.backup;
+import android.annotation.SystemApi;
import android.os.ParcelFileDescriptor;
import android.os.Process;
@@ -66,6 +67,7 @@
long mBackupWriter;
/** @hide */
+ @SystemApi
public BackupDataOutput(FileDescriptor fd) {
if (fd == null) throw new NullPointerException();
mBackupWriter = ctor(fd);
@@ -115,6 +117,7 @@
}
/** @hide */
+ @Override
protected void finalize() throws Throwable {
try {
dtor(mBackupWriter);
diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java
index e9297b9..1bb4eba 100644
--- a/core/java/android/app/backup/BackupManager.java
+++ b/core/java/android/app/backup/BackupManager.java
@@ -229,6 +229,28 @@
}
/**
+ * Enable/disable data restore at application install time. When enabled, app
+ * installation will include an attempt to fetch the app's historical data from
+ * the archival restore dataset (if any). When disabled, no such attempt will
+ * be made.
+ *
+ * <p>Callers must hold the android.permission.BACKUP permission to use this method.
+ *
+ * @hide
+ */
+ @SystemApi
+ public void setAutoRestore(boolean isEnabled) {
+ checkServiceBinder();
+ if (sService != null) {
+ try {
+ sService.setAutoRestore(isEnabled);
+ } catch (RemoteException e) {
+ Log.e(TAG, "setAutoRestore() couldn't connect");
+ }
+ }
+ }
+
+ /**
* Identify the currently selected transport. Callers must hold the
* android.permission.BACKUP permission to use this method.
* @return The name of the currently active backup transport. In case of
diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java
index 6cfabf0..70bb5e4 100644
--- a/core/java/android/app/backup/BackupTransport.java
+++ b/core/java/android/app/backup/BackupTransport.java
@@ -51,7 +51,7 @@
public static final int AGENT_UNKNOWN = -1004;
IBackupTransport mBinderImpl = new TransportImpl();
- /** @hide */
+
public IBinder getBinder() {
return mBinderImpl.asBinder();
}
diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java
index a767246..02f70c8 100644
--- a/core/java/android/appwidget/AppWidgetProviderInfo.java
+++ b/core/java/android/appwidget/AppWidgetProviderInfo.java
@@ -271,13 +271,13 @@
* @return The provider icon.
*/
public final Drawable loadIcon(@NonNull Context context, int density) {
- return loadDrawable(context, density, providerInfo.getIconResource());
+ return loadDrawable(context, density, providerInfo.getIconResource(), true);
}
/**
* Loads a preview of what the AppWidget will look like after it's configured.
- * If not supplied, the AppWidget's icon will be used. A client can optionally
- * provide a desired deinsity such as {@link android.util.DisplayMetrics#DENSITY_LOW}
+ * A client can optionally provide a desired density such as
+ * {@link android.util.DisplayMetrics#DENSITY_LOW}
* {@link android.util.DisplayMetrics#DENSITY_MEDIUM}, etc. If no density is
* provided, the density of the current display will be used.
* <p>
@@ -288,10 +288,10 @@
* @param context Context for accessing resources.
* @param density The optional desired density as per
* {@link android.util.DisplayMetrics#densityDpi}.
- * @return The widget preview image.
+ * @return The widget preview image or null if preview image is not available.
*/
public final Drawable loadPreviewImage(@NonNull Context context, int density) {
- return loadDrawable(context, density, previewImage);
+ return loadDrawable(context, density, previewImage, false);
}
/**
@@ -361,7 +361,8 @@
return 0;
}
- private Drawable loadDrawable(Context context, int density, int resourceId) {
+ private Drawable loadDrawable(Context context, int density, int resourceId,
+ boolean loadDefaultIcon) {
try {
Resources resources = context.getPackageManager().getResourcesForApplication(
providerInfo.applicationInfo);
@@ -374,7 +375,7 @@
} catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
/* ignore */
}
- return providerInfo.loadIcon(context.getPackageManager());
+ return loadDefaultIcon ? providerInfo.loadIcon(context.getPackageManager()) : null;
}
/**
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index 42b8dbf..f0b609a 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1428,6 +1428,9 @@
if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
synchronized (mManagerCallback) {
mService = null;
+ mLeScanClients.clear();
+ if (sBluetoothLeAdvertiser != null) sBluetoothLeAdvertiser.cleanup();
+ if (sBluetoothLeScanner != null) sBluetoothLeScanner.cleanup();
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
try {
if (cb != null) {
diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java
index 5a39dd6..c8df60e 100644
--- a/core/java/android/bluetooth/BluetoothGattServer.java
+++ b/core/java/android/bluetooth/BluetoothGattServer.java
@@ -519,6 +519,7 @@
* @param characteristic The local characteristic that has been updated
* @param confirm true to request confirmation from the client (indication),
* false to send a notification
+ * @throws IllegalArgumentException
* @return true, if the notification has been triggered successfully
*/
public boolean notifyCharacteristicChanged(BluetoothDevice device,
@@ -529,6 +530,11 @@
BluetoothGattService service = characteristic.getService();
if (service == null) return false;
+ if (characteristic.getValue() == null) {
+ throw new IllegalArgumentException("Chracteristic value is empty. Use "
+ + "BluetoothGattCharacteristic#setvalue to update");
+ }
+
try {
mService.sendNotification(mServerIf, device.getAddress(),
service.getType(), service.getInstanceId(),
diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
index 331ebfc..f6315ac 100644
--- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
+++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
@@ -175,6 +175,15 @@
}
}
+ /**
+ * Cleans up advertise clients. Should be called when bluetooth is down.
+ *
+ * @hide
+ */
+ public void cleanup() {
+ mLeAdvertisers.clear();
+ }
+
// Compute the size of the advertise data.
private int totalBytes(AdvertiseData data) {
if (data == null) {
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index 7c3cbc6..988cea5 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -209,6 +209,15 @@
}
/**
+ * Cleans up scan clients. Should be called when bluetooth is down.
+ *
+ * @hide
+ */
+ public void cleanup() {
+ mLeScanClients.clear();
+ }
+
+ /**
* Bluetooth GATT interface callbacks
*/
private static class BleScanCallbackWrapper extends BluetoothGattCallbackWrapper {
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java
index e7f33ff1..2f3d06f 100644
--- a/core/java/android/bluetooth/le/ScanRecord.java
+++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -257,9 +257,11 @@
}
return new ScanRecord(serviceUuids, manufacturerData, serviceData,
advertiseFlag, txPowerLevel, localName, scanRecord);
- } catch (IndexOutOfBoundsException e) {
+ } catch (Exception e) {
Log.e(TAG, "unable to parse scan record: " + Arrays.toString(scanRecord));
- return null;
+ // As the record is invalid, ignore all the parsed results for this packet
+ // and return an empty record with raw scanRecord bytes in results
+ return new ScanRecord(null, null, null, -1, Integer.MIN_VALUE, null, scanRecord);
}
}
diff --git a/core/java/android/bluetooth/le/Utils.java b/core/java/android/bluetooth/le/Utils.java
index 8598dd7..ccdae69 100644
--- a/core/java/android/bluetooth/le/Utils.java
+++ b/core/java/android/bluetooth/le/Utils.java
@@ -44,7 +44,7 @@
StringBuilder buffer = new StringBuilder();
buffer.append('{');
for (int i = 0; i < array.size(); ++i) {
- buffer.append(array.keyAt(i)).append("=").append(array.valueAt(i));
+ buffer.append(array.keyAt(i)).append("=").append(Arrays.toString(array.valueAt(i)));
}
buffer.append('}');
return buffer.toString();
diff --git a/core/java/android/content/AbstractRestrictionsProvider.java b/core/java/android/content/AbstractRestrictionsProvider.java
index 2b40870..262980e 100644
--- a/core/java/android/content/AbstractRestrictionsProvider.java
+++ b/core/java/android/content/AbstractRestrictionsProvider.java
@@ -21,6 +21,7 @@
import android.os.PersistableBundle;
/**
+ * @hide
* Abstract implementation of a Restrictions Provider BroadcastReceiver. To implement a
* Restrictions Provider, extend from this class and implement the abstract methods.
* Export this receiver in the manifest. A profile owner device admin can then register this
@@ -33,6 +34,8 @@
* {@link RestrictionsManager#notifyPermissionResponse(String, PersistableBundle)}.
*
* @see RestrictionsManager
+ * TODO: STOPSHIP: Remove before L ships, after clients have switched over
+ * to android.service.restrictions.RestrictionsReceiver. Bug: 17006805
*/
public abstract class AbstractRestrictionsProvider extends BroadcastReceiver {
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 0ca800f..b13792b 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -1612,7 +1612,7 @@
* @see #requestSync(android.accounts.Account, String, android.os.Bundle)
*/
public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork) {
- notifyChange(uri, observer, syncToNetwork, UserHandle.getCallingUserId());
+ notifyChange(uri, observer, syncToNetwork, UserHandle.myUserId());
}
/**
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 5f046c5..a13a928 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -45,6 +45,7 @@
import android.util.AttributeSet;
import android.view.DisplayAdjustments;
import android.view.Display;
+import android.view.ViewDebug;
import android.view.WindowManager;
import java.io.File;
@@ -420,6 +421,7 @@
/**
* Return the Theme object associated with this Context.
*/
+ @ViewDebug.ExportedProperty(deepExport = true)
public abstract Resources.Theme getTheme();
/**
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 974ff13..61e105b 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1419,21 +1419,6 @@
public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
/**
- * Activity Action: Prompt the user to confirm credentials (pin, pattern or password)
- * for the current user of the device. Launch this activity using
- * {@link android.app.Activity#startActivityForResult(Intent, int)} and check if the
- * result is {@link android.app.Activity#RESULT_OK} for a successful response to the
- * challenge.<p/>
- * This intent is handled by the system at a high priority and applications cannot intercept
- * it.<p/>
- * You can use {@link android.app.KeyguardManager#isKeyguardSecure()} to determine if the user will be
- * prompted.
- */
- @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
- public static final String ACTION_CONFIRM_DEVICE_CREDENTIAL = "android.intent.action.CONFIRM_DEVICE_CREDENTIAL";
-
-
- /**
* Specify whether the package should be uninstalled for all users.
* @hide because these should not be part of normal application flow.
*/
@@ -3192,17 +3177,11 @@
/**
* A CharSequence dialog title to provide to the user when used with a
- * {@link #ACTION_CHOOSER} or {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
+ * {@link #ACTION_CHOOSER}.
*/
public static final String EXTRA_TITLE = "android.intent.extra.TITLE";
/**
- * A CharSequence description to provide to the user when used with
- * {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.
- */
- public static final String EXTRA_DETAILS = "android.intent.extra.DETAILS";
-
- /**
* A Parcelable[] of {@link Intent} or
* {@link android.content.pm.LabeledIntent} objects as set with
* {@link #putExtra(String, Parcelable[])} of additional activities to place
@@ -3874,15 +3853,15 @@
/**
* By default a document created by {@link #FLAG_ACTIVITY_NEW_DOCUMENT} will
* have its entry in recent tasks removed when the user closes it (with back
- * or however else it may finish()). If you would like to instead allow the
+ * or however else it may finish()). If you would like to instead allow the
* document to be kept in recents so that it can be re-launched, you can use
- * this flag. When set and the task's activity is finished, the recents entry
- * will remain in the interface for the user to re-launch it, like a recents
- * entry for a top-level application.
- *
- * <p>The receiving activity can override this request with
- * {@link android.R.styleable#AndroidManifestActivity_autoRemoveFromRecents}
- * or by explcitly calling {@link android.app.Activity#finishAndRemoveTask()
+ * this flag. When set and the task's activity is finished, the recents
+ * entry will remain in the interface for the user to re-launch it, like a
+ * recents entry for a top-level application.
+ * <p>
+ * The receiving activity can override this request with
+ * {@link android.R.attr#autoRemoveFromRecents} or by explcitly calling
+ * {@link android.app.Activity#finishAndRemoveTask()
* Activity.finishAndRemoveTask()}.
*/
public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000;
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index cd4a7a0..1240a23 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -564,6 +564,11 @@
return mDataTypes != null && findMimeType(type);
}
+ /** @hide */
+ public final boolean hasExactDataType(String type) {
+ return mDataTypes != null && mDataTypes.contains(type);
+ }
+
/**
* Return the number of data types in the filter.
*/
@@ -681,6 +686,20 @@
return mPort;
}
+ /** @hide */
+ public boolean match(AuthorityEntry other) {
+ if (mWild != other.mWild) {
+ return false;
+ }
+ if (!mHost.equals(other.mHost)) {
+ return false;
+ }
+ if (mPort != other.mPort) {
+ return false;
+ }
+ return true;
+ }
+
/**
* Determine whether this AuthorityEntry matches the given data Uri.
* <em>Note that this comparison is case-sensitive, unlike formal
@@ -792,6 +811,21 @@
return false;
}
+ /** @hide */
+ public final boolean hasDataSchemeSpecificPart(PatternMatcher ssp) {
+ if (mDataSchemeSpecificParts == null) {
+ return false;
+ }
+ final int numDataSchemeSpecificParts = mDataSchemeSpecificParts.size();
+ for (int i = 0; i < numDataSchemeSpecificParts; i++) {
+ final PatternMatcher pe = mDataSchemeSpecificParts.get(i);
+ if (pe.getType() == ssp.getType() && pe.getPath().equals(ssp.getPath())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Return an iterator over the filter's data scheme specific parts.
*/
@@ -860,6 +894,20 @@
return matchDataAuthority(data) >= 0;
}
+ /** @hide */
+ public final boolean hasDataAuthority(AuthorityEntry auth) {
+ if (mDataAuthorities == null) {
+ return false;
+ }
+ final int numDataAuthorities = mDataAuthorities.size();
+ for (int i = 0; i < numDataAuthorities; i++) {
+ if (mDataAuthorities.get(i).match(auth)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Return an iterator over the filter's data authorities.
*/
@@ -942,6 +990,21 @@
return false;
}
+ /** @hide */
+ public final boolean hasDataPath(PatternMatcher path) {
+ if (mDataPaths == null) {
+ return false;
+ }
+ final int numDataPaths = mDataPaths.size();
+ for (int i = 0; i < numDataPaths; i++) {
+ final PatternMatcher pe = mDataPaths.get(i);
+ if (pe.getType() == path.getType() && pe.getPath().equals(path.getPath())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Return an iterator over the filter's data paths.
*/
@@ -1184,13 +1247,9 @@
* {@link #MATCH_CATEGORY_MASK} and {@link #MATCH_ADJUSTMENT_MASK}),
* or one of the error codes {@link #NO_MATCH_TYPE} if the type didn't match,
* {@link #NO_MATCH_DATA} if the scheme/path didn't match,
- * {@link #NO_MATCH_ACTION if the action didn't match, or
+ * {@link #NO_MATCH_ACTION} if the action didn't match, or
* {@link #NO_MATCH_CATEGORY} if one or more categories didn't match.
*
- * @return How well the filter matches. Negative if it doesn't match,
- * zero or positive positive value if it does with a higher
- * value representing a better match.
- *
* @see #match(String, String, String, android.net.Uri , Set, String)
*/
public final int match(ContentResolver resolver, Intent intent,
@@ -1218,7 +1277,7 @@
* {@link #MATCH_CATEGORY_MASK} and {@link #MATCH_ADJUSTMENT_MASK}),
* or one of the error codes {@link #NO_MATCH_TYPE} if the type didn't match,
* {@link #NO_MATCH_DATA} if the scheme/path didn't match,
- * {@link #NO_MATCH_ACTION if the action didn't match, or
+ * {@link #NO_MATCH_ACTION} if the action didn't match, or
* {@link #NO_MATCH_CATEGORY} if one or more categories didn't match.
*
* @see #matchData
diff --git a/core/java/android/content/RestrictionsManager.java b/core/java/android/content/RestrictionsManager.java
index c1226c0..849df55 100644
--- a/core/java/android/content/RestrictionsManager.java
+++ b/core/java/android/content/RestrictionsManager.java
@@ -26,6 +26,7 @@
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.RemoteException;
+import android.service.restrictions.RestrictionsReceiver;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Xml;
@@ -107,7 +108,7 @@
* </pre>
*
* @see RestrictionEntry
- * @see AbstractRestrictionsProvider
+ * @see RestrictionsReceiver
* @see DevicePolicyManager#setRestrictionsProvider(ComponentName, ComponentName)
* @see DevicePolicyManager#setApplicationRestrictions(ComponentName, String, Bundle)
*/
diff --git a/core/java/android/content/pm/FeatureGroupInfo.java b/core/java/android/content/pm/FeatureGroupInfo.java
new file mode 100644
index 0000000..79a6eea
--- /dev/null
+++ b/core/java/android/content/pm/FeatureGroupInfo.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package android.content.pm;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A set of features that can be requested by an application. This corresponds
+ * to information collected from the
+ * AndroidManifest.xml's {@code <feature-group>} tag.
+ */
+public final class FeatureGroupInfo implements Parcelable {
+
+ /**
+ * The list of features that are required by this group.
+ *
+ * @see FeatureInfo#FLAG_REQUIRED
+ */
+ public FeatureInfo[] features;
+
+ public FeatureGroupInfo() {
+ }
+
+ public FeatureGroupInfo(FeatureGroupInfo other) {
+ features = other.features;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeTypedArray(features, flags);
+ }
+
+ public static final Creator<FeatureGroupInfo> CREATOR = new Creator<FeatureGroupInfo>() {
+ @Override
+ public FeatureGroupInfo createFromParcel(Parcel source) {
+ FeatureGroupInfo group = new FeatureGroupInfo();
+ group.features = source.createTypedArray(FeatureInfo.CREATOR);
+ return group;
+ }
+
+ @Override
+ public FeatureGroupInfo[] newArray(int size) {
+ return new FeatureGroupInfo[size];
+ }
+ };
+}
diff --git a/core/java/android/content/pm/FeatureInfo.java b/core/java/android/content/pm/FeatureInfo.java
index d919fc3..79fa327 100644
--- a/core/java/android/content/pm/FeatureInfo.java
+++ b/core/java/android/content/pm/FeatureInfo.java
@@ -22,7 +22,7 @@
/**
* A single feature that can be requested by an application. This corresponds
* to information collected from the
- * AndroidManifest.xml's <uses-feature> tag.
+ * AndroidManifest.xml's {@code <uses-feature>} tag.
*/
public class FeatureInfo implements Parcelable {
/**
diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl
index 5223476..97be8f0 100644
--- a/core/java/android/content/pm/IPackageInstaller.aidl
+++ b/core/java/android/content/pm/IPackageInstaller.aidl
@@ -19,23 +19,22 @@
import android.content.pm.IPackageDeleteObserver2;
import android.content.pm.IPackageInstallerCallback;
import android.content.pm.IPackageInstallerSession;
-import android.content.pm.InstallSessionInfo;
-import android.content.pm.InstallSessionParams;
+import android.content.pm.PackageInstaller;
+import android.content.IntentSender;
/** {@hide} */
interface IPackageInstaller {
- int createSession(in InstallSessionParams params, String installerPackageName, int userId);
+ int createSession(in PackageInstaller.SessionParams params, String installerPackageName, int userId);
IPackageInstallerSession openSession(int sessionId);
- InstallSessionInfo getSessionInfo(int sessionId);
- List<InstallSessionInfo> getAllSessions(int userId);
- List<InstallSessionInfo> getMySessions(String installerPackageName, int userId);
+ PackageInstaller.SessionInfo getSessionInfo(int sessionId);
+ List<PackageInstaller.SessionInfo> getAllSessions(int userId);
+ List<PackageInstaller.SessionInfo> getMySessions(String installerPackageName, int userId);
void registerCallback(IPackageInstallerCallback callback, int userId);
void unregisterCallback(IPackageInstallerCallback callback);
- void uninstall(String packageName, int flags, in IPackageDeleteObserver2 observer, int userId);
- void uninstallSplit(String packageName, String splitName, int flags, in IPackageDeleteObserver2 observer, int userId);
+ void uninstall(String packageName, int flags, in IntentSender statusReceiver, int userId);
void setPermissionsResult(int sessionId, boolean accepted);
}
diff --git a/core/java/android/content/pm/IPackageInstallerSession.aidl b/core/java/android/content/pm/IPackageInstallerSession.aidl
index af0323f..aee3ba7 100644
--- a/core/java/android/content/pm/IPackageInstallerSession.aidl
+++ b/core/java/android/content/pm/IPackageInstallerSession.aidl
@@ -17,6 +17,7 @@
package android.content.pm;
import android.content.pm.IPackageInstallObserver2;
+import android.content.IntentSender;
import android.os.ParcelFileDescriptor;
/** {@hide} */
@@ -24,11 +25,11 @@
void setClientProgress(float progress);
void addClientProgress(float progress);
- String[] list();
+ String[] getNames();
ParcelFileDescriptor openWrite(String name, long offsetBytes, long lengthBytes);
ParcelFileDescriptor openRead(String name);
void close();
- void commit(in IPackageInstallObserver2 observer);
+ void commit(in IntentSender statusReceiver);
void abandon();
}
diff --git a/core/java/android/content/pm/InstallSessionInfo.aidl b/core/java/android/content/pm/InstallSessionInfo.aidl
deleted file mode 100644
index 3d21bbd..0000000
--- a/core/java/android/content/pm/InstallSessionInfo.aidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.pm;
-
-parcelable InstallSessionInfo;
diff --git a/core/java/android/content/pm/InstallSessionInfo.java b/core/java/android/content/pm/InstallSessionInfo.java
deleted file mode 100644
index 161bcde..0000000
--- a/core/java/android/content/pm/InstallSessionInfo.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.pm;
-
-import android.annotation.Nullable;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Details for an active install session.
- */
-public class InstallSessionInfo implements Parcelable {
-
- /** {@hide} */
- public int sessionId;
- /** {@hide} */
- public String installerPackageName;
- /** {@hide} */
- public String resolvedBaseCodePath;
- /** {@hide} */
- public float progress;
- /** {@hide} */
- public boolean sealed;
- /** {@hide} */
- public boolean open;
-
- /** {@hide} */
- public int mode;
- /** {@hide} */
- public long sizeBytes;
- /** {@hide} */
- public String appPackageName;
- /** {@hide} */
- public Bitmap appIcon;
- /** {@hide} */
- public CharSequence appLabel;
-
- /** {@hide} */
- public InstallSessionInfo() {
- }
-
- /** {@hide} */
- public InstallSessionInfo(Parcel source) {
- sessionId = source.readInt();
- installerPackageName = source.readString();
- resolvedBaseCodePath = source.readString();
- progress = source.readFloat();
- sealed = source.readInt() != 0;
- open = source.readInt() != 0;
-
- mode = source.readInt();
- sizeBytes = source.readLong();
- appPackageName = source.readString();
- appIcon = source.readParcelable(null);
- appLabel = source.readString();
- }
-
- /**
- * Return the ID for this session.
- */
- public int getSessionId() {
- return sessionId;
- }
-
- /**
- * Return the package name of the app that owns this session.
- */
- public @Nullable String getInstallerPackageName() {
- return installerPackageName;
- }
-
- /**
- * Return current overall progress of this session, between 0 and 1.
- * <p>
- * Note that this progress may not directly correspond to the value reported
- * by {@link PackageInstaller.Session#setProgress(float)}, as the system may
- * carve out a portion of the overall progress to represent its own internal
- * installation work.
- */
- public float getProgress() {
- return progress;
- }
-
- /**
- * Return if this session is currently open.
- */
- public boolean isOpen() {
- return open;
- }
-
- /**
- * Return the package name this session is working with. May be {@code null}
- * if unknown.
- */
- public @Nullable String getAppPackageName() {
- return appPackageName;
- }
-
- /**
- * Return an icon representing the app being installed. May be {@code null}
- * if unavailable.
- */
- public @Nullable Bitmap getAppIcon() {
- return appIcon;
- }
-
- /**
- * Return a label representing the app being installed. May be {@code null}
- * if unavailable.
- */
- public @Nullable CharSequence getAppLabel() {
- return appLabel;
- }
-
- /**
- * Return an Intent that can be started to view details about this install
- * session. This may surface actions such as pause, resume, or cancel.
- * <p>
- * In some cases, a matching Activity may not exist, so ensure you safeguard
- * against this.
- *
- * @see PackageInstaller#ACTION_SESSION_DETAILS
- */
- public @Nullable Intent getDetailsIntent() {
- final Intent intent = new Intent(PackageInstaller.ACTION_SESSION_DETAILS);
- intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
- intent.setPackage(installerPackageName);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- return intent;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(sessionId);
- dest.writeString(installerPackageName);
- dest.writeString(resolvedBaseCodePath);
- dest.writeFloat(progress);
- dest.writeInt(sealed ? 1 : 0);
- dest.writeInt(open ? 1 : 0);
-
- dest.writeInt(mode);
- dest.writeLong(sizeBytes);
- dest.writeString(appPackageName);
- dest.writeParcelable(appIcon, flags);
- dest.writeString(appLabel != null ? appLabel.toString() : null);
- }
-
- public static final Parcelable.Creator<InstallSessionInfo>
- CREATOR = new Parcelable.Creator<InstallSessionInfo>() {
- @Override
- public InstallSessionInfo createFromParcel(Parcel p) {
- return new InstallSessionInfo(p);
- }
-
- @Override
- public InstallSessionInfo[] newArray(int size) {
- return new InstallSessionInfo[size];
- }
- };
-}
diff --git a/core/java/android/content/pm/InstallSessionParams.aidl b/core/java/android/content/pm/InstallSessionParams.aidl
deleted file mode 100644
index 81b7574..0000000
--- a/core/java/android/content/pm/InstallSessionParams.aidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.pm;
-
-parcelable InstallSessionParams;
diff --git a/core/java/android/content/pm/InstallSessionParams.java b/core/java/android/content/pm/InstallSessionParams.java
deleted file mode 100644
index 1716e39..0000000
--- a/core/java/android/content/pm/InstallSessionParams.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.pm;
-
-import android.annotation.Nullable;
-import android.app.ActivityManager;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.android.internal.util.IndentingPrintWriter;
-
-/**
- * Parameters for creating a new {@link PackageInstaller.Session}.
- */
-public class InstallSessionParams implements Parcelable {
-
- /** {@hide} */
- public static final int MODE_INVALID = -1;
-
- /**
- * Mode for an install session whose staged APKs should fully replace any
- * existing APKs for the target app.
- */
- public static final int MODE_FULL_INSTALL = 1;
-
- /**
- * Mode for an install session that should inherit any existing APKs for the
- * target app, unless they have been explicitly overridden (based on split
- * name) by the session. For example, this can be used to add one or more
- * split APKs to an existing installation.
- * <p>
- * If there are no existing APKs for the target app, this behaves like
- * {@link #MODE_FULL_INSTALL}.
- */
- public static final int MODE_INHERIT_EXISTING = 2;
-
- /** {@hide} */
- public int mode = MODE_INVALID;
- /** {@hide} */
- public int installFlags;
- /** {@hide} */
- public int installLocation = PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY;
- /** {@hide} */
- public long sizeBytes = -1;
- /** {@hide} */
- public String appPackageName;
- /** {@hide} */
- public Bitmap appIcon;
- /** {@hide} */
- public String appLabel;
- /** {@hide} */
- public Uri originatingUri;
- /** {@hide} */
- public Uri referrerUri;
- /** {@hide} */
- public String abiOverride;
-
- /**
- * Construct parameters for a new package install session.
- *
- * @param mode one of {@link #MODE_FULL_INSTALL} or
- * {@link #MODE_INHERIT_EXISTING} describing how the session
- * should interact with an existing app.
- */
- public InstallSessionParams(int mode) {
- this.mode = mode;
- }
-
- /** {@hide} */
- public InstallSessionParams(Parcel source) {
- mode = source.readInt();
- installFlags = source.readInt();
- installLocation = source.readInt();
- sizeBytes = source.readLong();
- appPackageName = source.readString();
- appIcon = source.readParcelable(null);
- appLabel = source.readString();
- originatingUri = source.readParcelable(null);
- referrerUri = source.readParcelable(null);
- abiOverride = source.readString();
- }
-
- /**
- * Provide value of {@link PackageInfo#installLocation}, which may be used
- * to determine where the app will be staged. Defaults to
- * {@link PackageInfo#INSTALL_LOCATION_INTERNAL_ONLY}.
- */
- public void setInstallLocation(int installLocation) {
- this.installLocation = installLocation;
- }
-
- /**
- * @deprecated use {@link PackageInstaller.Session#openRead(String)} to
- * calculate message digest instead.
- * @hide
- */
- @Deprecated
- public void setSignatures(@Nullable Signature[] signatures) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Optionally indicate the total size (in bytes) of all APKs that will be
- * delivered in this session. The system may use this to ensure enough disk
- * space exists before proceeding, or to estimate container size for
- * installations living on external storage.
- *
- * @see PackageInfo#INSTALL_LOCATION_AUTO
- * @see PackageInfo#INSTALL_LOCATION_PREFER_EXTERNAL
- */
- public void setSize(long sizeBytes) {
- this.sizeBytes = sizeBytes;
- }
-
- /**
- * Optionally set the package name of the app being installed. It's strongly
- * recommended that you provide this value when known, so that observers can
- * communicate installing apps to users.
- * <p>
- * If the APKs staged in the session aren't consistent with this package
- * name, the install will fail. Regardless of this value, all APKs in the
- * app must have the same package name.
- */
- public void setAppPackageName(@Nullable String appPackageName) {
- this.appPackageName = appPackageName;
- }
-
- /**
- * Optionally set an icon representing the app being installed. This should
- * be roughly {@link ActivityManager#getLauncherLargeIconSize()} in both
- * dimensions.
- */
- public void setAppIcon(@Nullable Bitmap appIcon) {
- this.appIcon = appIcon;
- }
-
- /**
- * Optionally set a label representing the app being installed.
- */
- public void setAppLabel(@Nullable CharSequence appLabel) {
- this.appLabel = (appLabel != null) ? appLabel.toString() : null;
- }
-
- /**
- * Optionally set the URI where this package was downloaded from. Used for
- * verification purposes.
- *
- * @see Intent#EXTRA_ORIGINATING_URI
- */
- public void setOriginatingUri(@Nullable Uri originatingUri) {
- this.originatingUri = originatingUri;
- }
-
- /**
- * Optionally set the URI that referred you to install this package. Used
- * for verification purposes.
- *
- * @see Intent#EXTRA_REFERRER
- */
- public void setReferrerUri(@Nullable Uri referrerUri) {
- this.referrerUri = referrerUri;
- }
-
- /** {@hide} */
- public void dump(IndentingPrintWriter pw) {
- pw.printPair("mode", mode);
- pw.printHexPair("installFlags", installFlags);
- pw.printPair("installLocation", installLocation);
- pw.printPair("sizeBytes", sizeBytes);
- pw.printPair("appPackageName", appPackageName);
- pw.printPair("appIcon", (appIcon != null));
- pw.printPair("appLabel", appLabel);
- pw.printPair("originatingUri", originatingUri);
- pw.printPair("referrerUri", referrerUri);
- pw.printPair("abiOverride", abiOverride);
- pw.println();
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(mode);
- dest.writeInt(installFlags);
- dest.writeInt(installLocation);
- dest.writeLong(sizeBytes);
- dest.writeString(appPackageName);
- dest.writeParcelable(appIcon, flags);
- dest.writeString(appLabel);
- dest.writeParcelable(originatingUri, flags);
- dest.writeParcelable(referrerUri, flags);
- dest.writeString(abiOverride);
- }
-
- public static final Parcelable.Creator<InstallSessionParams>
- CREATOR = new Parcelable.Creator<InstallSessionParams>() {
- @Override
- public InstallSessionParams createFromParcel(Parcel p) {
- return new InstallSessionParams(p);
- }
-
- @Override
- public InstallSessionParams[] newArray(int size) {
- return new InstallSessionParams[size];
- }
- };
-}
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index 268919c..f9370b3 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -64,7 +64,7 @@
/**
* Callbacks for package changes to this and related managed profiles.
*/
- public static abstract class OnAppsChangedCallback {
+ public static abstract class Callback {
/**
* Indicates that a package was removed from the specified profile.
*
@@ -207,17 +207,17 @@
}
/**
- * Starts an activity in the specified profile.
+ * Starts a Main activity in the specified profile.
*
* @param component The ComponentName of the activity to launch
* @param user The UserHandle of the profile
* @param sourceBounds The Rect containing the source bounds of the clicked icon
* @param opts Options to pass to startActivity
*/
- public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds,
+ public void startMainActivity(ComponentName component, UserHandle user, Rect sourceBounds,
Bundle opts) {
if (DEBUG) {
- Log.i(TAG, "StartActivityForProfile " + component + " " + user.getIdentifier());
+ Log.i(TAG, "StartMainActivity " + component + " " + user.getIdentifier());
}
try {
mService.startActivityAsUser(component, sourceBounds, opts, user);
@@ -235,7 +235,7 @@
* @param sourceBounds The Rect containing the source bounds of the clicked icon
* @param opts Options to pass to startActivity
*/
- public void showAppDetailsForProfile(ComponentName component, UserHandle user,
+ public void startAppDetailsActivity(ComponentName component, UserHandle user,
Rect sourceBounds, Bundle opts) {
try {
mService.showAppDetailsAsUser(component, sourceBounds, opts, user);
@@ -252,7 +252,7 @@
*
* @return true if the package exists and is enabled.
*/
- public boolean isPackageEnabledForProfile(String packageName, UserHandle user) {
+ public boolean isPackageEnabled(String packageName, UserHandle user) {
try {
return mService.isPackageEnabled(packageName, user);
} catch (RemoteException re) {
@@ -268,7 +268,7 @@
*
* @return true if the activity exists and is enabled.
*/
- public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) {
+ public boolean isActivityEnabled(ComponentName component, UserHandle user) {
try {
return mService.isActivityEnabled(component, user);
} catch (RemoteException re) {
@@ -282,8 +282,8 @@
*
* @param callback The callback to add.
*/
- public void addOnAppsChangedCallback(OnAppsChangedCallback callback) {
- addOnAppsChangedCallback(callback, null);
+ public void addCallback(Callback callback) {
+ addCallback(callback, null);
}
/**
@@ -292,7 +292,7 @@
* @param callback The callback to add.
* @param handler that should be used to post callbacks on, may be null.
*/
- public void addOnAppsChangedCallback(OnAppsChangedCallback callback, Handler handler) {
+ public void addCallback(Callback callback, Handler handler) {
synchronized (this) {
if (callback != null && !mCallbacks.contains(callback)) {
boolean addedFirstCallback = mCallbacks.size() == 0;
@@ -311,9 +311,9 @@
* Removes a callback that was previously added.
*
* @param callback The callback to remove.
- * @see #addOnAppsChangedListener(OnAppsChangedCallback)
+ * @see #addCallback(Callback)
*/
- public void removeOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ public void removeCallback(Callback callback) {
synchronized (this) {
removeCallbackLocked(callback);
if (mCallbacks.size() == 0) {
@@ -325,7 +325,7 @@
}
}
- private void removeCallbackLocked(OnAppsChangedCallback callback) {
+ private void removeCallbackLocked(Callback callback) {
if (callback == null) {
throw new IllegalArgumentException("Callback cannot be null");
}
@@ -338,7 +338,7 @@
}
}
- private void addCallbackLocked(OnAppsChangedCallback callback, Handler handler) {
+ private void addCallbackLocked(Callback callback, Handler handler) {
// Remove if already present.
removeCallbackLocked(callback);
if (handler == null) {
@@ -421,7 +421,7 @@
private static final int MSG_AVAILABLE = 4;
private static final int MSG_UNAVAILABLE = 5;
- private OnAppsChangedCallback mCallback;
+ private LauncherApps.Callback mCallback;
private static class CallbackInfo {
String[] packageNames;
@@ -430,7 +430,7 @@
UserHandle user;
}
- public CallbackMessageHandler(Looper looper, OnAppsChangedCallback callback) {
+ public CallbackMessageHandler(Looper looper, LauncherApps.Callback callback) {
super(looper, null, true);
mCallback = callback;
}
@@ -499,4 +499,45 @@
obtainMessage(MSG_UNAVAILABLE, info).sendToTarget();
}
}
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public static abstract class OnAppsChangedCallback extends Callback {
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void addOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ addCallback(callback, null);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void addOnAppsChangedCallback(OnAppsChangedCallback callback, Handler handler) {
+ addCallback(callback, handler);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void removeOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ removeCallback(callback);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds,
+ Bundle opts) {
+ startMainActivity(component, user, sourceBounds, opts);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void showAppDetailsForProfile(ComponentName component, UserHandle user,
+ Rect sourceBounds, Bundle opts) {
+ startAppDetailsActivity(component, user, sourceBounds, opts);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public boolean isPackageEnabledForProfile(String packageName, UserHandle user) {
+ return isPackageEnabled(packageName, user);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) {
+ return isActivityEnabled(component, user);
+ }
}
diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java
index 49ffef2..765b2a9 100644
--- a/core/java/android/content/pm/PackageInfo.java
+++ b/core/java/android/content/pm/PackageInfo.java
@@ -180,7 +180,7 @@
* {@link android.R.styleable#AndroidManifestUsesConfiguration
* <uses-configuration>} tags included under <manifest>,
* or null if there were none. This is only filled in if the flag
- * {@link PackageManager#GET_CONFIGURATIONS} was set.
+ * {@link PackageManager#GET_CONFIGURATIONS} was set.
*/
public ConfigurationInfo[] configPreferences;
@@ -192,6 +192,16 @@
public FeatureInfo[] reqFeatures;
/**
+ * Groups of features that this application has requested.
+ * Each group contains a set of features that are required.
+ * A device must match the features listed in {@link #reqFeatures} and one
+ * or more FeatureGroups in order to have satisfied the feature requirement.
+ *
+ * @see FeatureInfo#FLAG_REQUIRED
+ */
+ public FeatureGroupInfo[] featureGroups;
+
+ /**
* Constant corresponding to <code>auto</code> in
* the {@link android.R.attr#installLocation} attribute.
* @hide
@@ -217,19 +227,6 @@
public static final int INSTALL_LOCATION_PREFER_EXTERNAL = 2;
/**
- * Flag for {@link #requiredForProfile}
- * The application will always be installed for a restricted profile.
- * @hide
- */
- public static final int RESTRICTED_PROFILE = 1;
- /**
- * Flag for {@link #requiredForProfile}
- * The application will always be installed for a managed profile.
- * @hide
- */
- public static final int MANAGED_PROFILE = 2;
-
- /**
* The install location requested by the package. From the
* {@link android.R.attr#installLocation} attribute, one of
* {@link #INSTALL_LOCATION_AUTO}, {@link #INSTALL_LOCATION_INTERNAL_ONLY},
@@ -237,12 +234,6 @@
*/
public int installLocation = INSTALL_LOCATION_INTERNAL_ONLY;
- /**
- * Defines which profiles this app is required for.
- * @hide
- */
- public int requiredForProfile;
-
/** @hide */
public boolean requiredForAllUsers;
@@ -300,9 +291,9 @@
dest.writeTypedArray(signatures, parcelableFlags);
dest.writeTypedArray(configPreferences, parcelableFlags);
dest.writeTypedArray(reqFeatures, parcelableFlags);
+ dest.writeTypedArray(featureGroups, parcelableFlags);
dest.writeInt(installLocation);
dest.writeInt(requiredForAllUsers ? 1 : 0);
- dest.writeInt(requiredForProfile);
dest.writeString(restrictedAccountType);
dest.writeString(requiredAccountType);
dest.writeString(overlayTarget);
@@ -344,9 +335,9 @@
signatures = source.createTypedArray(Signature.CREATOR);
configPreferences = source.createTypedArray(ConfigurationInfo.CREATOR);
reqFeatures = source.createTypedArray(FeatureInfo.CREATOR);
+ featureGroups = source.createTypedArray(FeatureGroupInfo.CREATOR);
installLocation = source.readInt();
requiredForAllUsers = source.readInt() != 0;
- requiredForProfile = source.readInt();
restrictedAccountType = source.readString();
requiredAccountType = source.readString();
overlayTarget = source.readString();
diff --git a/core/java/android/content/pm/PackageInstallerParams.aidl b/core/java/android/content/pm/PackageInstaller.aidl
similarity index 88%
rename from core/java/android/content/pm/PackageInstallerParams.aidl
rename to core/java/android/content/pm/PackageInstaller.aidl
index b3dde21..270f870 100644
--- a/core/java/android/content/pm/PackageInstallerParams.aidl
+++ b/core/java/android/content/pm/PackageInstaller.aidl
@@ -16,4 +16,5 @@
package android.content.pm;
-parcelable PackageInstallerParams;
+parcelable PackageInstaller.SessionParams;
+parcelable PackageInstaller.SessionInfo;
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index d70e22c..7419ebc 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -20,17 +20,24 @@
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
-import android.app.PackageDeleteObserver;
-import android.app.PackageInstallObserver;
+import android.app.ActivityManager;
+import android.content.Context;
import android.content.Intent;
-import android.os.Bundle;
+import android.content.IntentSender;
+import android.graphics.Bitmap;
+import android.net.Uri;
import android.os.FileBridge;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.Parcel;
import android.os.ParcelFileDescriptor;
+import android.os.Parcelable;
import android.os.RemoteException;
import android.util.ExceptionUtils;
+import android.util.Log;
+
+import com.android.internal.util.IndentingPrintWriter;
import java.io.Closeable;
import java.io.IOException;
@@ -67,13 +74,15 @@
* </ul>
*/
public class PackageInstaller {
+ private static final String TAG = "PackageInstaller";
+
/**
* Activity Action: Show details about a particular install session. This
* may surface actions such as pause, resume, or cancel.
* <p>
* This should always be scoped to the installer package that owns the
- * session. Clients should use {@link InstallSessionInfo#getDetailsIntent()}
- * to build this intent correctly.
+ * session. Clients should use {@link SessionInfo#getDetailsIntent()} to
+ * build this intent correctly.
* <p>
* In some cases, a matching Activity may not exist, so ensure you safeguard
* against this.
@@ -92,9 +101,114 @@
*/
public static final String EXTRA_SESSION_ID = "android.content.pm.extra.SESSION_ID";
+ public static final String EXTRA_STATUS = "android.content.pm.extra.STATUS";
+ public static final String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
+
+ /**
+ * Package name relevant to a status.
+ *
+ * @see Intent#getStringExtra(String)
+ */
+ public static final String EXTRA_PACKAGE_NAME = "android.content.pm.extra.PACKAGE_NAME";
+
+ /** {@hide} */
+ @Deprecated
+ public static final String EXTRA_PACKAGE_NAMES = "android.content.pm.extra.PACKAGE_NAMES";
+
+ /** {@hide} */
+ public static final String EXTRA_LEGACY_STATUS = "android.content.pm.extra.LEGACY_STATUS";
+ /** {@hide} */
+ public static final String EXTRA_LEGACY_BUNDLE = "android.content.pm.extra.LEGACY_BUNDLE";
/** {@hide} */
public static final String EXTRA_CALLBACK = "android.content.pm.extra.CALLBACK";
+ /**
+ * User action is currently required to proceed. You can launch the intent
+ * activity described by {@link Intent#EXTRA_INTENT} to involve the user and
+ * continue.
+ * <p>
+ * You may choose to immediately launch the intent if the user is actively
+ * using your app. Otherwise, you should use a notification to guide the
+ * user back into your app before launching.
+ *
+ * @see Intent#getParcelableExtra(String)
+ */
+ public static final int STATUS_PENDING_USER_ACTION = -1;
+
+ /**
+ * The operation succeeded.
+ */
+ public static final int STATUS_SUCCESS = 0;
+
+ /**
+ * The operation failed in a generic way. The system will always try to
+ * provide a more specific failure reason, but in some rare cases this may
+ * be delivered.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE = 1;
+
+ /**
+ * The operation failed because it was blocked. For example, a device policy
+ * may be blocking the operation, a package verifier may have blocked the
+ * operation, or the app may be required for core system operation.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_BLOCKED = 2;
+
+ /**
+ * The operation failed because it was actively aborted. For example, the
+ * user actively declined requested permissions, or the session was
+ * abandoned.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_ABORTED = 3;
+
+ /**
+ * The operation failed because one or more of the APKs was invalid. For
+ * example, they might be malformed, corrupt, incorrectly signed,
+ * mismatched, etc.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_INVALID = 4;
+
+ /**
+ * The operation failed because it conflicts (or is inconsistent with) with
+ * another package already installed on the device. For example, an existing
+ * permission, incompatible certificates, etc. The user may be able to
+ * uninstall another app to fix the issue.
+ * <p>
+ * The result may also contain {@link #EXTRA_PACKAGE_NAME} with the
+ * specific package identified as the cause of the conflict.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_CONFLICT = 5;
+
+ /**
+ * The operation failed because of storage issues. For example, the device
+ * may be running low on space, or external media may be unavailable. The
+ * user may be able to help free space or insert different external media.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_STORAGE = 6;
+
+ /**
+ * The operation failed because it is fundamentally incompatible with this
+ * device. For example, the app may require a hardware feature that doesn't
+ * exist, it may be missing native code for the ABIs supported by the
+ * device, or it requires a newer SDK version, etc.
+ *
+ * @see #EXTRA_STATUS_MESSAGE
+ */
+ public static final int STATUS_FAILURE_INCOMPATIBLE = 7;
+
+ private final Context mContext;
private final PackageManager mPm;
private final IPackageInstaller mInstaller;
private final int mUserId;
@@ -103,8 +217,9 @@
private final ArrayList<SessionCallbackDelegate> mDelegates = new ArrayList<>();
/** {@hide} */
- public PackageInstaller(PackageManager pm, IPackageInstaller installer,
+ public PackageInstaller(Context context, PackageManager pm, IPackageInstaller installer,
String installerPackageName, int userId) {
+ mContext = context;
mPm = pm;
mInstaller = installer;
mInstallerPackageName = installerPackageName;
@@ -126,7 +241,7 @@
* This ID remains consistent across device reboots until the
* session is finalized. IDs are not reused during a given boot.
*/
- public int createSession(@NonNull InstallSessionParams params) throws IOException {
+ public int createSession(@NonNull SessionParams params) throws IOException {
try {
return mInstaller.createSession(params, mInstallerPackageName, mUserId);
} catch (RuntimeException e) {
@@ -153,7 +268,7 @@
* Return details for a specific session. To succeed, the caller must either
* own this session, or be the current home app.
*/
- public @Nullable InstallSessionInfo getSessionInfo(int sessionId) {
+ public @Nullable SessionInfo getSessionInfo(int sessionId) {
try {
return mInstaller.getSessionInfo(sessionId);
} catch (RemoteException e) {
@@ -165,7 +280,7 @@
* Return list of all active install sessions, regardless of the installer.
* To succeed, the caller must be the current home app.
*/
- public @NonNull List<InstallSessionInfo> getAllSessions() {
+ public @NonNull List<SessionInfo> getAllSessions() {
try {
return mInstaller.getAllSessions(mUserId);
} catch (RemoteException e) {
@@ -176,7 +291,7 @@
/**
* Return list of all install sessions owned by the calling app.
*/
- public @NonNull List<InstallSessionInfo> getMySessions() {
+ public @NonNull List<SessionInfo> getMySessions() {
try {
return mInstaller.getMySessions(mInstallerPackageName, mUserId);
} catch (RemoteException e) {
@@ -189,25 +304,9 @@
* method is only available to the current "installer of record" for the
* package.
*/
- public void uninstall(@NonNull String packageName, @NonNull UninstallCallback callback) {
+ public void uninstall(@NonNull String packageName, @NonNull IntentSender statusReceiver) {
try {
- mInstaller.uninstall(packageName, 0,
- new UninstallCallbackDelegate(callback).getBinder(), mUserId);
- } catch (RemoteException e) {
- throw e.rethrowAsRuntimeException();
- }
- }
-
- /**
- * Uninstall only a specific split from the given package.
- *
- * @hide
- */
- public void uninstall(@NonNull String packageName, @NonNull String splitName,
- @NonNull UninstallCallback callback) {
- try {
- mInstaller.uninstallSplit(packageName, splitName, 0,
- new UninstallCallbackDelegate(callback).getBinder(), mUserId);
+ mInstaller.uninstall(packageName, 0, statusReceiver, mUserId);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -353,6 +452,14 @@
* calling thread.
*/
public void addSessionCallback(@NonNull SessionCallback callback, @NonNull Handler handler) {
+ // TODO: remove this temporary guard once we have new prebuilts
+ final ApplicationInfo info = mContext.getApplicationInfo();
+ if ("com.google.android.googlequicksearchbox".equals(info.packageName)
+ && info.versionCode <= 300400070) {
+ Log.d(TAG, "Ignoring callback request from old prebuilt");
+ return;
+ }
+
synchronized (mDelegates) {
final SessionCallbackDelegate delegate = new SessionCallbackDelegate(callback,
handler.getLooper());
@@ -436,7 +543,7 @@
* You can write data into the returned stream, optionally call
* {@link #fsync(OutputStream)} as needed to ensure bytes have been
* persisted to disk, and then close when finished. All streams must be
- * closed before calling {@link #commit(CommitCallback)}.
+ * closed before calling {@link #commit(IntentSender)}.
*
* @param name arbitrary, unique name of your choosing to identify the
* APK being written. You can open a file again for
@@ -476,14 +583,17 @@
}
/**
- * List all APK names contained in this session.
+ * Return all APK names contained in this session.
* <p>
* This returns all names which have been previously written through
* {@link #openWrite(String, long, long)} as part of this session.
*/
- public @NonNull String[] list() {
+ public @NonNull String[] getNames() throws IOException {
try {
- return mSession.list();
+ return mSession.getNames();
+ } catch (RuntimeException e) {
+ ExceptionUtils.maybeUnwrapIOException(e);
+ throw e;
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -518,9 +628,9 @@
* on the session. If the device reboots before the session has been
* finalized, you may commit the session again.
*/
- public void commit(@NonNull CommitCallback callback) {
+ public void commit(@NonNull IntentSender statusReceiver) {
try {
- mSession.commit(new CommitCallbackDelegate(callback).getBinder());
+ mSession.commit(statusReceiver);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -553,169 +663,350 @@
}
/**
- * Events for a specific uninstall request.
+ * Parameters for creating a new {@link PackageInstaller.Session}.
*/
- public static abstract class UninstallCallback {
- /**
- * Generic unknown failure. The system will always try to provide a more
- * specific failure reason, but in some rare cases this may be
- * delivered.
- */
- public static final int FAILURE_UNKNOWN = 0;
+ public static class SessionParams implements Parcelable {
+
+ /** {@hide} */
+ public static final int MODE_INVALID = -1;
/**
- * This uninstall was blocked. The package may be required for core
- * system operation, or the user may be restricted. Attempting to
- * uninstall again will have the same result.
+ * Mode for an install session whose staged APKs should fully replace any
+ * existing APKs for the target app.
*/
- public static final int FAILURE_BLOCKED = 1;
+ public static final int MODE_FULL_INSTALL = 1;
/**
- * This uninstall was actively aborted. For example, the user declined
- * to uninstall. You may try to uninstall again.
- */
- public static final int FAILURE_ABORTED = 2;
-
- /**
- * User action is required to proceed. You can start the given intent
- * activity to involve the user and continue.
+ * Mode for an install session that should inherit any existing APKs for the
+ * target app, unless they have been explicitly overridden (based on split
+ * name) by the session. For example, this can be used to add one or more
+ * split APKs to an existing installation.
* <p>
- * You may choose to immediately launch the intent if the user is
- * actively using your app. However, you should use a notification to
- * guide the user back into your app if not currently active.
+ * If there are no existing APKs for the target app, this behaves like
+ * {@link #MODE_FULL_INSTALL}.
*/
- public abstract void onUserActionRequired(Intent intent);
+ public static final int MODE_INHERIT_EXISTING = 2;
- public abstract void onSuccess();
- public abstract void onFailure(int failureReason, String msg, Bundle extras);
- }
+ /** {@hide} */
+ public int mode = MODE_INVALID;
+ /** {@hide} */
+ public int installFlags;
+ /** {@hide} */
+ public int installLocation = PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY;
+ /** {@hide} */
+ public long sizeBytes = -1;
+ /** {@hide} */
+ public String appPackageName;
+ /** {@hide} */
+ public Bitmap appIcon;
+ /** {@hide} */
+ public String appLabel;
+ /** {@hide} */
+ public Uri originatingUri;
+ /** {@hide} */
+ public Uri referrerUri;
+ /** {@hide} */
+ public String abiOverride;
- /** {@hide} */
- private static class UninstallCallbackDelegate extends PackageDeleteObserver {
- private final UninstallCallback target;
+ /**
+ * Construct parameters for a new package install session.
+ *
+ * @param mode one of {@link #MODE_FULL_INSTALL} or
+ * {@link #MODE_INHERIT_EXISTING} describing how the session
+ * should interact with an existing app.
+ */
+ public SessionParams(int mode) {
+ this.mode = mode;
+ }
- public UninstallCallbackDelegate(UninstallCallback target) {
- this.target = target;
+ /** {@hide} */
+ public SessionParams(Parcel source) {
+ mode = source.readInt();
+ installFlags = source.readInt();
+ installLocation = source.readInt();
+ sizeBytes = source.readLong();
+ appPackageName = source.readString();
+ appIcon = source.readParcelable(null);
+ appLabel = source.readString();
+ originatingUri = source.readParcelable(null);
+ referrerUri = source.readParcelable(null);
+ abiOverride = source.readString();
+ }
+
+ /**
+ * Provide value of {@link PackageInfo#installLocation}, which may be used
+ * to determine where the app will be staged. Defaults to
+ * {@link PackageInfo#INSTALL_LOCATION_INTERNAL_ONLY}.
+ */
+ public void setInstallLocation(int installLocation) {
+ this.installLocation = installLocation;
+ }
+
+ /**
+ * Optionally indicate the total size (in bytes) of all APKs that will be
+ * delivered in this session. The system may use this to ensure enough disk
+ * space exists before proceeding, or to estimate container size for
+ * installations living on external storage.
+ *
+ * @see PackageInfo#INSTALL_LOCATION_AUTO
+ * @see PackageInfo#INSTALL_LOCATION_PREFER_EXTERNAL
+ */
+ public void setSize(long sizeBytes) {
+ this.sizeBytes = sizeBytes;
+ }
+
+ /**
+ * Optionally set the package name of the app being installed. It's strongly
+ * recommended that you provide this value when known, so that observers can
+ * communicate installing apps to users.
+ * <p>
+ * If the APKs staged in the session aren't consistent with this package
+ * name, the install will fail. Regardless of this value, all APKs in the
+ * app must have the same package name.
+ */
+ public void setAppPackageName(@Nullable String appPackageName) {
+ this.appPackageName = appPackageName;
+ }
+
+ /**
+ * Optionally set an icon representing the app being installed. This should
+ * be roughly {@link ActivityManager#getLauncherLargeIconSize()} in both
+ * dimensions.
+ */
+ public void setAppIcon(@Nullable Bitmap appIcon) {
+ this.appIcon = appIcon;
+ }
+
+ /**
+ * Optionally set a label representing the app being installed.
+ */
+ public void setAppLabel(@Nullable CharSequence appLabel) {
+ this.appLabel = (appLabel != null) ? appLabel.toString() : null;
+ }
+
+ /**
+ * Optionally set the URI where this package was downloaded from. Used for
+ * verification purposes.
+ *
+ * @see Intent#EXTRA_ORIGINATING_URI
+ */
+ public void setOriginatingUri(@Nullable Uri originatingUri) {
+ this.originatingUri = originatingUri;
+ }
+
+ /**
+ * Optionally set the URI that referred you to install this package. Used
+ * for verification purposes.
+ *
+ * @see Intent#EXTRA_REFERRER
+ */
+ public void setReferrerUri(@Nullable Uri referrerUri) {
+ this.referrerUri = referrerUri;
+ }
+
+ /** {@hide} */
+ public void dump(IndentingPrintWriter pw) {
+ pw.printPair("mode", mode);
+ pw.printHexPair("installFlags", installFlags);
+ pw.printPair("installLocation", installLocation);
+ pw.printPair("sizeBytes", sizeBytes);
+ pw.printPair("appPackageName", appPackageName);
+ pw.printPair("appIcon", (appIcon != null));
+ pw.printPair("appLabel", appLabel);
+ pw.printPair("originatingUri", originatingUri);
+ pw.printPair("referrerUri", referrerUri);
+ pw.printPair("abiOverride", abiOverride);
+ pw.println();
}
@Override
- public void onUserActionRequired(Intent intent) {
- target.onUserActionRequired(intent);
+ public int describeContents() {
+ return 0;
}
@Override
- public void onPackageDeleted(String basePackageName, int returnCode, String msg) {
- if (returnCode == PackageManager.DELETE_SUCCEEDED) {
- target.onSuccess();
- } else {
- final int failureReason = PackageManager.deleteStatusToFailureReason(returnCode);
- msg = PackageManager.deleteStatusToString(returnCode) + ": " + msg;
- target.onFailure(failureReason, msg, null);
- }
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mode);
+ dest.writeInt(installFlags);
+ dest.writeInt(installLocation);
+ dest.writeLong(sizeBytes);
+ dest.writeString(appPackageName);
+ dest.writeParcelable(appIcon, flags);
+ dest.writeString(appLabel);
+ dest.writeParcelable(originatingUri, flags);
+ dest.writeParcelable(referrerUri, flags);
+ dest.writeString(abiOverride);
}
+
+ public static final Parcelable.Creator<SessionParams>
+ CREATOR = new Parcelable.Creator<SessionParams>() {
+ @Override
+ public SessionParams createFromParcel(Parcel p) {
+ return new SessionParams(p);
+ }
+
+ @Override
+ public SessionParams[] newArray(int size) {
+ return new SessionParams[size];
+ }
+ };
}
/**
- * Final result of a session commit request.
+ * Details for an active install session.
*/
- public static abstract class CommitCallback {
- /**
- * Generic unknown failure. The system will always try to provide a more
- * specific failure reason, but in some rare cases this may be
- * delivered.
- */
- public static final int FAILURE_UNKNOWN = 0;
+ public static class SessionInfo implements Parcelable {
+
+ /** {@hide} */
+ public int sessionId;
+ /** {@hide} */
+ public String installerPackageName;
+ /** {@hide} */
+ public String resolvedBaseCodePath;
+ /** {@hide} */
+ public float progress;
+ /** {@hide} */
+ public boolean sealed;
+ /** {@hide} */
+ public boolean open;
+
+ /** {@hide} */
+ public int mode;
+ /** {@hide} */
+ public long sizeBytes;
+ /** {@hide} */
+ public String appPackageName;
+ /** {@hide} */
+ public Bitmap appIcon;
+ /** {@hide} */
+ public CharSequence appLabel;
+
+ /** {@hide} */
+ public SessionInfo() {
+ }
+
+ /** {@hide} */
+ public SessionInfo(Parcel source) {
+ sessionId = source.readInt();
+ installerPackageName = source.readString();
+ resolvedBaseCodePath = source.readString();
+ progress = source.readFloat();
+ sealed = source.readInt() != 0;
+ open = source.readInt() != 0;
+
+ mode = source.readInt();
+ sizeBytes = source.readLong();
+ appPackageName = source.readString();
+ appIcon = source.readParcelable(null);
+ appLabel = source.readString();
+ }
/**
- * One or more of the APKs included in the session was invalid. For
- * example, they might be malformed, corrupt, incorrectly signed,
- * mismatched, etc. The installer may want to try downloading and
- * installing again.
+ * Return the ID for this session.
*/
- public static final int FAILURE_INVALID = 1;
+ public int getSessionId() {
+ return sessionId;
+ }
/**
- * This install session conflicts (or is inconsistent with) with another
- * package already installed on the device. For example, an existing
- * permission, incompatible certificates, etc. The user may be able to
- * uninstall another app to fix the issue.
+ * Return the package name of the app that owns this session.
+ */
+ public @Nullable String getInstallerPackageName() {
+ return installerPackageName;
+ }
+
+ /**
+ * Return current overall progress of this session, between 0 and 1.
* <p>
- * The extras bundle may contain {@link #EXTRA_PACKAGE_NAME} with the
- * specific packages identified as the cause of the conflict.
+ * Note that this progress may not directly correspond to the value reported
+ * by {@link PackageInstaller.Session#setProgress(float)}, as the system may
+ * carve out a portion of the overall progress to represent its own internal
+ * installation work.
*/
- public static final int FAILURE_CONFLICT = 2;
+ public float getProgress() {
+ return progress;
+ }
/**
- * This install session failed due to storage issues. For example,
- * the device may be running low on space, or the required external
- * media may be unavailable. The user may be able to help free space
- * or insert the correct media.
+ * Return if this session is currently open.
*/
- public static final int FAILURE_STORAGE = 3;
+ public boolean isOpen() {
+ return open;
+ }
/**
- * This install session is fundamentally incompatible with this
- * device. For example, the package may require a hardware feature
- * that doesn't exist, it may be missing native code for the device
- * ABI, or it requires a newer SDK version, etc. This install would
- * never succeed.
+ * Return the package name this session is working with. May be {@code null}
+ * if unknown.
*/
- public static final int FAILURE_INCOMPATIBLE = 4;
+ public @Nullable String getAppPackageName() {
+ return appPackageName;
+ }
/**
- * This install session failed because it was actively aborted. For
- * example, the user declined requested permissions, or a verifier
- * rejected the session.
+ * Return an icon representing the app being installed. May be {@code null}
+ * if unavailable.
+ */
+ public @Nullable Bitmap getAppIcon() {
+ return appIcon;
+ }
+
+ /**
+ * Return a label representing the app being installed. May be {@code null}
+ * if unavailable.
+ */
+ public @Nullable CharSequence getAppLabel() {
+ return appLabel;
+ }
+
+ /**
+ * Return an Intent that can be started to view details about this install
+ * session. This may surface actions such as pause, resume, or cancel.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you safeguard
+ * against this.
*
- * @see PackageManager#VERIFICATION_REJECT
+ * @see PackageInstaller#ACTION_SESSION_DETAILS
*/
- public static final int FAILURE_ABORTED = 5;
-
- public static final String EXTRA_PACKAGE_NAME = "android.content.pm.extra.PACKAGE_NAME";
-
- /**
- * User action is required to proceed. You can start the given intent
- * activity to involve the user and continue.
- * <p>
- * You may choose to immediately launch the intent if the user is
- * actively using your app. However, you should use a notification to
- * guide the user back into your app if not currently active.
- */
- public abstract void onUserActionRequired(Intent intent);
-
- public abstract void onSuccess();
- public abstract void onFailure(int failureReason, String msg, Bundle extras);
- }
-
- /** {@hide} */
- private static class CommitCallbackDelegate extends PackageInstallObserver {
- private final CommitCallback target;
-
- public CommitCallbackDelegate(CommitCallback target) {
- this.target = target;
+ public @Nullable Intent getDetailsIntent() {
+ final Intent intent = new Intent(PackageInstaller.ACTION_SESSION_DETAILS);
+ intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
+ intent.setPackage(installerPackageName);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ return intent;
}
@Override
- public void onUserActionRequired(Intent intent) {
- target.onUserActionRequired(intent);
+ public int describeContents() {
+ return 0;
}
@Override
- public void onPackageInstalled(String basePackageName, int returnCode, String msg,
- Bundle extras) {
- if (returnCode == PackageManager.INSTALL_SUCCEEDED) {
- target.onSuccess();
- } else {
- final int failureReason = PackageManager.installStatusToFailureReason(returnCode);
- msg = PackageManager.installStatusToString(returnCode) + ": " + msg;
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(sessionId);
+ dest.writeString(installerPackageName);
+ dest.writeString(resolvedBaseCodePath);
+ dest.writeFloat(progress);
+ dest.writeInt(sealed ? 1 : 0);
+ dest.writeInt(open ? 1 : 0);
- if (extras != null) {
- extras.putString(CommitCallback.EXTRA_PACKAGE_NAME,
- extras.getString(PackageManager.EXTRA_FAILURE_EXISTING_PACKAGE));
- }
-
- target.onFailure(failureReason, msg, extras);
- }
+ dest.writeInt(mode);
+ dest.writeLong(sizeBytes);
+ dest.writeString(appPackageName);
+ dest.writeParcelable(appIcon, flags);
+ dest.writeString(appLabel != null ? appLabel.toString() : null);
}
+
+ public static final Parcelable.Creator<SessionInfo>
+ CREATOR = new Parcelable.Creator<SessionInfo>() {
+ @Override
+ public SessionInfo createFromParcel(Parcel p) {
+ return new SessionInfo(p);
+ }
+
+ @Override
+ public SessionInfo[] newArray(int size) {
+ return new SessionInfo[size];
+ }
+ };
}
}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index b957a15..56b7164 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -28,8 +28,6 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.IntentSender;
-import android.content.pm.PackageInstaller.CommitCallback;
-import android.content.pm.PackageInstaller.UninstallCallback;
import android.content.pm.PackageParser.PackageParserException;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
@@ -179,9 +177,9 @@
/**
* {@link PackageInfo} flag: return information about
* hardware preferences in
- * {@link PackageInfo#configPreferences PackageInfo.configPreferences} and
- * requested features in {@link PackageInfo#reqFeatures
- * PackageInfo.reqFeatures}.
+ * {@link PackageInfo#configPreferences PackageInfo.configPreferences},
+ * and requested features in {@link PackageInfo#reqFeatures} and
+ * {@link PackageInfo#featureGroups}.
*/
public static final int GET_CONFIGURATIONS = 0x00004000;
@@ -3797,6 +3795,16 @@
public abstract boolean isPackageAvailable(String packageName);
/** {@hide} */
+ public static String installStatusToString(int status, String msg) {
+ final String str = installStatusToString(status);
+ if (msg != null) {
+ return str + ": " + msg;
+ } else {
+ return str;
+ }
+ }
+
+ /** {@hide} */
public static String installStatusToString(int status) {
switch (status) {
case INSTALL_SUCCEEDED: return "INSTALL_SUCCEEDED";
@@ -3845,49 +3853,60 @@
}
/** {@hide} */
- public static int installStatusToFailureReason(int status) {
+ public static int installStatusToPublicStatus(int status) {
switch (status) {
- case INSTALL_FAILED_ALREADY_EXISTS: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_INVALID_APK: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_INVALID_URI: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_INSUFFICIENT_STORAGE: return CommitCallback.FAILURE_STORAGE;
- case INSTALL_FAILED_DUPLICATE_PACKAGE: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_NO_SHARED_USER: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_UPDATE_INCOMPATIBLE: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_SHARED_USER_INCOMPATIBLE: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_MISSING_SHARED_LIBRARY: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_REPLACE_COULDNT_DELETE: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_DEXOPT: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_OLDER_SDK: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_CONFLICTING_PROVIDER: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_NEWER_SDK: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_TEST_ONLY: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_CPU_ABI_INCOMPATIBLE: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_MISSING_FEATURE: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_CONTAINER_ERROR: return CommitCallback.FAILURE_STORAGE;
- case INSTALL_FAILED_INVALID_INSTALL_LOCATION: return CommitCallback.FAILURE_STORAGE;
- case INSTALL_FAILED_MEDIA_UNAVAILABLE: return CommitCallback.FAILURE_STORAGE;
- case INSTALL_FAILED_VERIFICATION_TIMEOUT: return CommitCallback.FAILURE_ABORTED;
- case INSTALL_FAILED_VERIFICATION_FAILURE: return CommitCallback.FAILURE_ABORTED;
- case INSTALL_FAILED_PACKAGE_CHANGED: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_UID_CHANGED: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_VERSION_DOWNGRADE: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_NOT_APK: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_BAD_MANIFEST: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_NO_CERTIFICATES: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_MANIFEST_MALFORMED: return CommitCallback.FAILURE_INVALID;
- case INSTALL_PARSE_FAILED_MANIFEST_EMPTY: return CommitCallback.FAILURE_INVALID;
- case INSTALL_FAILED_INTERNAL_ERROR: return CommitCallback.FAILURE_UNKNOWN;
- case INSTALL_FAILED_USER_RESTRICTED: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_DUPLICATE_PERMISSION: return CommitCallback.FAILURE_CONFLICT;
- case INSTALL_FAILED_NO_MATCHING_ABIS: return CommitCallback.FAILURE_INCOMPATIBLE;
- case INSTALL_FAILED_ABORTED: return CommitCallback.FAILURE_ABORTED;
- default: return CommitCallback.FAILURE_UNKNOWN;
+ case INSTALL_SUCCEEDED: return PackageInstaller.STATUS_SUCCESS;
+ case INSTALL_FAILED_ALREADY_EXISTS: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_INVALID_APK: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_INVALID_URI: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_INSUFFICIENT_STORAGE: return PackageInstaller.STATUS_FAILURE_STORAGE;
+ case INSTALL_FAILED_DUPLICATE_PACKAGE: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_NO_SHARED_USER: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_UPDATE_INCOMPATIBLE: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_SHARED_USER_INCOMPATIBLE: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_MISSING_SHARED_LIBRARY: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_REPLACE_COULDNT_DELETE: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_DEXOPT: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_OLDER_SDK: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_CONFLICTING_PROVIDER: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_NEWER_SDK: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_TEST_ONLY: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_CPU_ABI_INCOMPATIBLE: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_MISSING_FEATURE: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_CONTAINER_ERROR: return PackageInstaller.STATUS_FAILURE_STORAGE;
+ case INSTALL_FAILED_INVALID_INSTALL_LOCATION: return PackageInstaller.STATUS_FAILURE_STORAGE;
+ case INSTALL_FAILED_MEDIA_UNAVAILABLE: return PackageInstaller.STATUS_FAILURE_STORAGE;
+ case INSTALL_FAILED_VERIFICATION_TIMEOUT: return PackageInstaller.STATUS_FAILURE_ABORTED;
+ case INSTALL_FAILED_VERIFICATION_FAILURE: return PackageInstaller.STATUS_FAILURE_ABORTED;
+ case INSTALL_FAILED_PACKAGE_CHANGED: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_UID_CHANGED: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_VERSION_DOWNGRADE: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_NOT_APK: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_BAD_MANIFEST: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_NO_CERTIFICATES: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_MANIFEST_MALFORMED: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_PARSE_FAILED_MANIFEST_EMPTY: return PackageInstaller.STATUS_FAILURE_INVALID;
+ case INSTALL_FAILED_INTERNAL_ERROR: return PackageInstaller.STATUS_FAILURE;
+ case INSTALL_FAILED_USER_RESTRICTED: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_DUPLICATE_PERMISSION: return PackageInstaller.STATUS_FAILURE_CONFLICT;
+ case INSTALL_FAILED_NO_MATCHING_ABIS: return PackageInstaller.STATUS_FAILURE_INCOMPATIBLE;
+ case INSTALL_FAILED_ABORTED: return PackageInstaller.STATUS_FAILURE_ABORTED;
+ default: return PackageInstaller.STATUS_FAILURE;
+ }
+ }
+
+ /** {@hide} */
+ public static String deleteStatusToString(int status, String msg) {
+ final String str = deleteStatusToString(status);
+ if (msg != null) {
+ return str + ": " + msg;
+ } else {
+ return str;
}
}
@@ -3905,14 +3924,15 @@
}
/** {@hide} */
- public static int deleteStatusToFailureReason(int status) {
+ public static int deleteStatusToPublicStatus(int status) {
switch (status) {
- case DELETE_FAILED_INTERNAL_ERROR: return UninstallCallback.FAILURE_UNKNOWN;
- case DELETE_FAILED_DEVICE_POLICY_MANAGER: return UninstallCallback.FAILURE_BLOCKED;
- case DELETE_FAILED_USER_RESTRICTED: return UninstallCallback.FAILURE_BLOCKED;
- case DELETE_FAILED_OWNER_BLOCKED: return UninstallCallback.FAILURE_BLOCKED;
- case DELETE_FAILED_ABORTED: return UninstallCallback.FAILURE_ABORTED;
- default: return UninstallCallback.FAILURE_UNKNOWN;
+ case DELETE_SUCCEEDED: return PackageInstaller.STATUS_SUCCESS;
+ case DELETE_FAILED_INTERNAL_ERROR: return PackageInstaller.STATUS_FAILURE;
+ case DELETE_FAILED_DEVICE_POLICY_MANAGER: return PackageInstaller.STATUS_FAILURE_BLOCKED;
+ case DELETE_FAILED_USER_RESTRICTED: return PackageInstaller.STATUS_FAILURE_BLOCKED;
+ case DELETE_FAILED_OWNER_BLOCKED: return PackageInstaller.STATUS_FAILURE_BLOCKED;
+ case DELETE_FAILED_ABORTED: return PackageInstaller.STATUS_FAILURE_ABORTED;
+ default: return PackageInstaller.STATUS_FAILURE;
}
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index db87cf7..eb8b762 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -413,7 +413,6 @@
if ((pi.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0
|| (pi.applicationInfo.flags&ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
pi.requiredForAllUsers = p.mRequiredForAllUsers;
- pi.requiredForProfile = p.mRequiredForProfile;
}
pi.restrictedAccountType = p.mRestrictedAccountType;
pi.requiredAccountType = p.mRequiredAccountType;
@@ -434,6 +433,11 @@
pi.reqFeatures = new FeatureInfo[N];
p.reqFeatures.toArray(pi.reqFeatures);
}
+ N = p.featureGroups != null ? p.featureGroups.size() : 0;
+ if (N > 0) {
+ pi.featureGroups = new FeatureGroupInfo[N];
+ p.featureGroups.toArray(pi.featureGroups);
+ }
}
if ((flags&PackageManager.GET_ACTIVITIES) != 0) {
int N = p.activities.size();
@@ -592,7 +596,7 @@
public final static int PARSE_ON_SDCARD = 1<<5;
public final static int PARSE_IS_SYSTEM_DIR = 1<<6;
public final static int PARSE_IS_PRIVILEGED = 1<<7;
- public final static int PARSE_GET_SIGNATURES = 1<<8;
+ public final static int PARSE_COLLECT_CERTIFICATES = 1<<8;
public final static int PARSE_TRUSTED_OVERLAY = 1<<9;
private static final Comparator<String> sSplitNameComparator = new SplitNameComparator();
@@ -1083,34 +1087,6 @@
}
}
- /**
- * Only collect certificates on the manifest; does not validate signatures
- * across remainder of package.
- */
- private static Signature[] collectManifestCertificates(File apkFile)
- throws PackageParserException {
- final String apkPath = apkFile.getAbsolutePath();
- try {
- final StrictJarFile jarFile = new StrictJarFile(apkPath);
- try {
- final ZipEntry jarEntry = jarFile.findEntry(ANDROID_MANIFEST_FILENAME);
- if (jarEntry == null) {
- throw new PackageParserException(INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,
- "Package " + apkPath + " has no manifest");
- }
-
- final Certificate[][] certs = loadCertificates(jarFile, jarEntry);
- return convertToSignatures(certs);
-
- } finally {
- jarFile.close();
- }
- } catch (GeneralSecurityException | IOException | RuntimeException e) {
- throw new PackageParserException(INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING,
- "Failed to collect certificates from " + apkPath, e);
- }
- }
-
private static Signature[] convertToSignatures(Certificate[][] certs)
throws CertificateEncodingException {
final Signature[] res = new Signature[certs.length];
@@ -1125,7 +1101,8 @@
* file, including package name, split name, and install location.
*
* @param apkFile path to a single APK
- * @param flags optional parse flags, such as {@link #PARSE_GET_SIGNATURES}
+ * @param flags optional parse flags, such as
+ * {@link #PARSE_COLLECT_CERTIFICATES}
*/
public static ApkLite parseApkLite(File apkFile, int flags)
throws PackageParserException {
@@ -1150,11 +1127,12 @@
final Resources res = new Resources(assets, metrics, null);
parser = assets.openXmlResourceParser(cookie, ANDROID_MANIFEST_FILENAME);
- // Only collect certificates on the manifest; does not validate
- // signatures across remainder of package.
final Signature[] signatures;
- if ((flags & PARSE_GET_SIGNATURES) != 0) {
- signatures = collectManifestCertificates(apkFile);
+ if ((flags & PARSE_COLLECT_CERTIFICATES) != 0) {
+ // TODO: factor signature related items out of Package object
+ final Package tempPkg = new Package(null);
+ collectCertificates(tempPkg, apkFile, 0);
+ signatures = tempPkg.mSignatures;
} else {
signatures = null;
}
@@ -1502,24 +1480,7 @@
XmlUtils.skipCurrentTag(parser);
} else if (tagName.equals("uses-feature")) {
- FeatureInfo fi = new FeatureInfo();
- sa = res.obtainAttributes(attrs,
- com.android.internal.R.styleable.AndroidManifestUsesFeature);
- // Note: don't allow this value to be a reference to a resource
- // that may change.
- fi.name = sa.getNonResourceString(
- com.android.internal.R.styleable.AndroidManifestUsesFeature_name);
- if (fi.name == null) {
- fi.reqGlEsVersion = sa.getInt(
- com.android.internal.R.styleable.AndroidManifestUsesFeature_glEsVersion,
- FeatureInfo.GL_ES_VERSION_UNDEFINED);
- }
- if (sa.getBoolean(
- com.android.internal.R.styleable.AndroidManifestUsesFeature_required,
- true)) {
- fi.flags |= FeatureInfo.FLAG_REQUIRED;
- }
- sa.recycle();
+ FeatureInfo fi = parseUsesFeature(res, attrs);
pkg.reqFeatures = ArrayUtils.add(pkg.reqFeatures, fi);
if (fi.name == null) {
@@ -1531,9 +1492,35 @@
XmlUtils.skipCurrentTag(parser);
} else if (tagName.equals("feature-group")) {
- // Skip this for now until we know what to do with it.
+ FeatureGroupInfo group = new FeatureGroupInfo();
+ ArrayList<FeatureInfo> features = null;
+ final int innerDepth = parser.getDepth();
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && (type != XmlPullParser.END_TAG || parser.getDepth() > innerDepth)) {
+ if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
+ continue;
+ }
- XmlUtils.skipCurrentTag(parser);
+ final String innerTagName = parser.getName();
+ if (innerTagName.equals("uses-feature")) {
+ FeatureInfo featureInfo = parseUsesFeature(res, attrs);
+ // FeatureGroups are stricter and mandate that
+ // any <uses-feature> declared are mandatory.
+ featureInfo.flags |= FeatureInfo.FLAG_REQUIRED;
+ features = ArrayUtils.add(features, featureInfo);
+ } else {
+ Slog.w(TAG, "Unknown element under <feature-group>: " + innerTagName +
+ " at " + mArchiveSourcePath + " " +
+ parser.getPositionDescription());
+ }
+ XmlUtils.skipCurrentTag(parser);
+ }
+
+ if (features != null) {
+ group.features = new FeatureInfo[features.size()];
+ group.features = features.toArray(group.features);
+ }
+ pkg.featureGroups = ArrayUtils.add(pkg.featureGroups, group);
} else if (tagName.equals("uses-sdk")) {
if (SDK_VERSION > 0) {
@@ -1851,6 +1838,28 @@
return pkg;
}
+ private FeatureInfo parseUsesFeature(Resources res, AttributeSet attrs)
+ throws XmlPullParserException, IOException {
+ FeatureInfo fi = new FeatureInfo();
+ TypedArray sa = res.obtainAttributes(attrs,
+ com.android.internal.R.styleable.AndroidManifestUsesFeature);
+ // Note: don't allow this value to be a reference to a resource
+ // that may change.
+ fi.name = sa.getNonResourceString(
+ com.android.internal.R.styleable.AndroidManifestUsesFeature_name);
+ if (fi.name == null) {
+ fi.reqGlEsVersion = sa.getInt(
+ com.android.internal.R.styleable.AndroidManifestUsesFeature_glEsVersion,
+ FeatureInfo.GL_ES_VERSION_UNDEFINED);
+ }
+ if (sa.getBoolean(
+ com.android.internal.R.styleable.AndroidManifestUsesFeature_required, true)) {
+ fi.flags |= FeatureInfo.FLAG_REQUIRED;
+ }
+ sa.recycle();
+ return fi;
+ }
+
private boolean parseUsesPermission(Package pkg, Resources res, XmlResourceParser parser,
AttributeSet attrs, String[] outError)
throws XmlPullParserException, IOException {
@@ -2441,8 +2450,6 @@
false)) {
owner.mRequiredForAllUsers = true;
}
- owner.mRequiredForProfile = sa.getInt(
- com.android.internal.R.styleable.AndroidManifestApplication_requiredForProfile, 0);
String restrictedAccountType = sa.getString(com.android.internal.R.styleable
.AndroidManifestApplication_restrictedAccountType);
@@ -4225,14 +4232,14 @@
// Applications requested features
public ArrayList<FeatureInfo> reqFeatures = null;
+ // Applications requested feature groups
+ public ArrayList<FeatureGroupInfo> featureGroups = null;
+
public int installLocation;
/* An app that's required for all users and cannot be uninstalled for a user */
public boolean mRequiredForAllUsers;
- /* For which types of profile this app is required */
- public int mRequiredForProfile;
-
/* The restricted account authenticator type that is used by this application */
public String mRestrictedAccountType;
@@ -4256,6 +4263,16 @@
public ArraySet<String> mUpgradeKeySets;
public ArrayMap<String, ArraySet<PublicKey>> mKeySetMapping;
+ /**
+ * The install time abi override for this package, if any.
+ *
+ * TODO: This seems like a horrible place to put the abiOverride because
+ * this isn't something the packageParser parsers. However, this fits in with
+ * the rest of the PackageManager where package scanning randomly pushes
+ * and prods fields out of {@code this.applicationInfo}.
+ */
+ public String cpuAbiOverride;
+
public Package(String packageName) {
this.packageName = packageName;
applicationInfo.packageName = packageName;
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index af574db..4e7da48 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -70,7 +70,7 @@
/**
* Additional flag for {@link #protectionLevel}, corresponding
- * to the <code>development</code> value of
+ * to the <code>appop</code> value of
* {@link android.R.attr#protectionLevel}.
*/
public static final int PROTECTION_FLAG_APPOP = 0x40;
diff --git a/core/java/android/content/pm/VerificationParams.java b/core/java/android/content/pm/VerificationParams.java
index bf1f77f..e5119b6 100644
--- a/core/java/android/content/pm/VerificationParams.java
+++ b/core/java/android/content/pm/VerificationParams.java
@@ -24,7 +24,7 @@
/**
* Represents verification parameters used to verify packages to be installed.
*
- * @deprecated callers should migrate to {@link PackageInstallerParams}.
+ * @deprecated callers should migrate to {@link PackageInstaller}.
* @hide
*/
@Deprecated
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 52d1c79..31813c10 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -16,6 +16,7 @@
package android.content.res;
+import android.view.ViewDebug;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -715,7 +716,13 @@
* @see #getDrawable(int, Theme)
*/
public Drawable getDrawable(int id) throws NotFoundException {
- return getDrawable(id, null);
+ final Drawable d = getDrawable(id, null);
+ if (d.canApplyTheme()) {
+ Log.w(TAG, "Drawable " + getResourceName(id) + " has unresolved theme "
+ + "attributes! Consider using Resources.getDrawable(int, Theme) or "
+ + "Context.getDrawable(int).", new RuntimeException());
+ }
+ return d;
}
/**
@@ -1632,12 +1639,41 @@
/*package*/ String getKey() {
return mKey;
}
+
+ private String getResourceNameFromHexString(String hexString) {
+ return getResourceName(Integer.parseInt(hexString, 16));
+ }
+
+ /**
+ * Parses {@link #mKey} and returns a String array that holds pairs of adjacent Theme data:
+ * resource name followed by whether or not it was forced, as specified by
+ * {@link #applyStyle(int, boolean)}.
+ *
+ * @hide
+ */
+ @ViewDebug.ExportedProperty(category = "theme", hasAdjacentMapping = true)
+ public String[] getTheme() {
+ String[] themeData = mKey.split(" ");
+ String[] themes = new String[themeData.length * 2];
+ String theme;
+ boolean forced;
+
+ for (int i = 0, j = themeData.length - 1; i < themes.length; i += 2, --j) {
+ theme = themeData[j];
+ forced = theme.endsWith("!");
+ themes[i] = forced ?
+ getResourceNameFromHexString(theme.substring(0, theme.length() - 1)) :
+ getResourceNameFromHexString(theme);
+ themes[i + 1] = forced ? "forced" : "not forced";
+ }
+ return themes;
+ }
}
/**
* Generate a new Theme object for this set of Resources. It initially
* starts out empty.
- *
+ *
* @return Theme The newly created Theme container.
*/
public final Theme newTheme() {
@@ -1647,7 +1683,7 @@
/**
* Retrieve a set of basic attribute values from an AttributeSet, not
* performing styling of them using a theme and/or style resources.
- *
+ *
* @param set The current attribute values to retrieve.
* @param attrs The specific attributes to be retrieved.
* @return Returns a TypedArray holding an array of the attribute values.
diff --git a/core/java/android/content/res/ResourcesKey.java b/core/java/android/content/res/ResourcesKey.java
index 53e0f2c..e0f1b3a 100644
--- a/core/java/android/content/res/ResourcesKey.java
+++ b/core/java/android/content/res/ResourcesKey.java
@@ -62,8 +62,12 @@
return false;
}
ResourcesKey peer = (ResourcesKey) obj;
- if (!mResDir.equals(peer.mResDir)) {
- return false;
+ if (mResDir != peer.mResDir) {
+ if (mResDir == null || peer.mResDir == null) {
+ return false;
+ } else if (!mResDir.equals(peer.mResDir)) {
+ return false;
+ }
}
if (mDisplayId != peer.mDisplayId) {
return false;
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index eadfa73..310ab76 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1558,6 +1558,26 @@
return _enableShutterSound(enabled);
}
+ /**
+ * Disable the shutter sound unconditionally.
+ *
+ * <p>
+ * This is only guaranteed to work for legacy cameras
+ * (i.e. initialized with {@link #cameraInitUnspecified}). Trying to call this on
+ * a regular camera will force a conditional check in the camera service.
+ * </p>
+ *
+ * @return {@code true} if the shutter sound state was successfully
+ * changed. {@code false} if the shutter sound state could not be
+ * changed. {@code true} is also returned if shutter sound playback
+ * is already set to the requested state.
+ *
+ * @hide
+ */
+ public final boolean disableShutterSound() {
+ return _enableShutterSound(/*enabled*/false);
+ }
+
private native final boolean _enableShutterSound(boolean enabled);
/**
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index d60a2c2..b52a0c5 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -348,7 +348,7 @@
* A sensor of this type returns the number of steps taken by the user since the last reboot
* while activated. The value is returned as a float (with the fractional part set to zero) and
* is reset to zero only on a system reboot. The timestamp of the event is set to the time when
- * the first step for that event was taken. This sensor is implemented in hardware and is
+ * the last step for that event was taken. This sensor is implemented in hardware and is
* expected to be low power.
* <p>
* See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.
diff --git a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
index c68d8c3..5cbf109 100644
--- a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
+++ b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
@@ -56,6 +56,7 @@
* Keep up to date with ICameraDeviceUser.aidl.
* </p>
*/
+@SuppressWarnings("deprecation")
public class CameraDeviceUserShim implements ICameraDeviceUser {
private static final String TAG = "CameraDeviceUserShim";
@@ -259,6 +260,7 @@
super(l);
}
+ @Override
public void handleMessage(Message msg) {
try {
switch (msg.what) {
@@ -320,6 +322,9 @@
// Check errors old HAL initialization
CameraBinderDecorator.throwOnError(initErrors);
+ // Disable shutter sounds (this will work unconditionally) for api2 clients
+ legacyCamera.disableShutterSound();
+
CameraInfo info = new CameraInfo();
Camera.getCameraInfo(cameraId, info);
diff --git a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
index cbf4a3d..1cf7797 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
@@ -510,4 +510,6 @@
/*out*/int[/*2*/] dimens);
private static native int nativeSetNextTimestamp(Surface surface, long timestamp);
+
+ static native int nativeGetJpegFooterSize();
}
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index 0337c96..ee0ca9c 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -33,6 +33,7 @@
import android.hardware.camera2.utils.ArrayUtils;
import android.hardware.camera2.utils.ListUtils;
import android.hardware.camera2.utils.ParamsUtils;
+import android.hardware.camera2.utils.SizeAreaComparator;
import android.util.Log;
import android.util.Range;
import android.util.Size;
@@ -40,6 +41,8 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import static com.android.internal.util.Preconditions.*;
@@ -187,8 +190,10 @@
* flash.*
*/
mapFlash(m, p);
-
- // TODO: map other fields
+ /*
+ * jpeg.*
+ */
+ mapJpeg(m, p);
/*
* scaler.*
@@ -595,6 +600,16 @@
m.set(FLASH_INFO_AVAILABLE, flashAvailable);
}
+ private static void mapJpeg(CameraMetadataNative m, Camera.Parameters p) {
+ List<Camera.Size> thumbnailSizes = p.getSupportedJpegThumbnailSizes();
+
+ if (thumbnailSizes != null) {
+ Size[] sizes = convertSizeListToArray(thumbnailSizes);
+ Arrays.sort(sizes, new SizeAreaComparator());
+ m.set(JPEG_AVAILABLE_THUMBNAIL_SIZES, sizes);
+ }
+ }
+
private static void mapRequest(CameraMetadataNative m, Parameters p) {
/*
* request.availableCapabilities
@@ -1192,6 +1207,9 @@
m.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, bestRange);
}
+ // control.sceneMode -- DISABLED is always available
+ m.set(CaptureRequest.CONTROL_SCENE_MODE, CONTROL_SCENE_MODE_DISABLED);
+
/*
* statistics.*
*/
diff --git a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
index 35646fe..4c4ad0d 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
@@ -24,6 +24,7 @@
import android.hardware.camera2.params.MeteringRectangle;
import android.hardware.camera2.utils.ListUtils;
import android.hardware.camera2.utils.ParamsUtils;
+import android.location.Location;
import android.util.Log;
import android.util.Range;
import android.util.Size;
@@ -44,6 +45,8 @@
private static final String TAG = "LegacyRequestMapper";
private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+ private static final byte DEFAULT_JPEG_QUALITY = 85;
+
/**
* Set the legacy parameters using the {@link LegacyRequest legacy request}.
*
@@ -350,6 +353,70 @@
+ testPatternMode + "; only OFF is supported");
}
}
+
+ /*
+ * jpeg.*
+ */
+
+ // jpeg.gpsLocation
+ {
+ Location location = request.get(JPEG_GPS_LOCATION);
+ if (location != null) {
+ if (checkForCompleteGpsData(location)) {
+ params.setGpsAltitude(location.getAltitude());
+ params.setGpsLatitude(location.getLatitude());
+ params.setGpsLongitude(location.getLongitude());
+ params.setGpsProcessingMethod(location.getProvider().toUpperCase());
+ params.setGpsTimestamp(location.getTime());
+ } else {
+ Log.w(TAG, "Incomplete GPS parameters provided in location " + location);
+ }
+ } else {
+ params.removeGpsData();
+ }
+ }
+
+ // jpeg.orientation
+ {
+ int orientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+ params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, orientation));
+ }
+
+ // jpeg.quality
+ {
+ params.setJpegQuality(0xFF & ParamsUtils.getOrDefault(request, JPEG_QUALITY,
+ DEFAULT_JPEG_QUALITY));
+ }
+
+ // jpeg.thumbnailQuality
+ {
+ params.setJpegQuality(0xFF & ParamsUtils.getOrDefault(request, JPEG_THUMBNAIL_QUALITY,
+ DEFAULT_JPEG_QUALITY));
+ }
+
+ // jpeg.thumbnailSize
+ {
+ List<Camera.Size> sizes = params.getSupportedJpegThumbnailSizes();
+
+ if (sizes != null && sizes.size() > 0) {
+ Size s = request.get(JPEG_THUMBNAIL_SIZE);
+ boolean invalidSize = (s == null) ? false : !ParameterUtils.containsSize(sizes,
+ s.getWidth(), s.getHeight());
+ if (invalidSize) {
+ Log.w(TAG, "Invalid JPEG thumbnail size set " + s + ", skipping thumbnail...");
+ }
+ if (s == null || invalidSize) {
+ // (0,0) = "no thumbnail" in Camera API 1
+ params.setJpegThumbnailSize(/*width*/0, /*height*/0);
+ } else {
+ params.setJpegThumbnailSize(s.getWidth(), s.getHeight());
+ }
+ }
+ }
+ }
+
+ private static boolean checkForCompleteGpsData(Location location) {
+ return location != null && location.getProvider() != null && location.getTime() != 0;
}
static int filterSupportedCaptureIntent(int captureIntent) {
diff --git a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
index a2f9b4c..090a822 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java
@@ -28,6 +28,7 @@
import android.hardware.camera2.params.MeteringRectangle;
import android.hardware.camera2.utils.ListUtils;
import android.hardware.camera2.utils.ParamsUtils;
+import android.location.Location;
import android.util.Log;
import android.util.Size;
@@ -250,6 +251,29 @@
result.set(SENSOR_TEST_PATTERN_MODE, SENSOR_TEST_PATTERN_MODE_OFF);
}
+ /*
+ * jpeg
+ */
+ // jpeg.gpsLocation
+ result.set(JPEG_GPS_LOCATION, request.get(CaptureRequest.JPEG_GPS_LOCATION));
+
+ // jpeg.orientation
+ result.set(JPEG_ORIENTATION, request.get(CaptureRequest.JPEG_ORIENTATION));
+
+ // jpeg.quality
+ result.set(JPEG_QUALITY, (byte) params.getJpegQuality());
+
+ // jpeg.thumbnailQuality
+ result.set(JPEG_THUMBNAIL_QUALITY, (byte) params.getJpegThumbnailQuality());
+
+ // jpeg.thumbnailSize
+ Camera.Size s = params.getJpegThumbnailSize();
+ if (s != null) {
+ result.set(JPEG_THUMBNAIL_SIZE, ParameterUtils.convertSize(s));
+ } else {
+ Log.w(TAG, "Null thumbnail size received from parameters.");
+ }
+
// TODO: Remaining result metadata tags conversions.
return result;
}
diff --git a/core/java/android/hardware/camera2/legacy/ParameterUtils.java b/core/java/android/hardware/camera2/legacy/ParameterUtils.java
index 385f844..98adcea 100644
--- a/core/java/android/hardware/camera2/legacy/ParameterUtils.java
+++ b/core/java/android/hardware/camera2/legacy/ParameterUtils.java
@@ -253,6 +253,33 @@
}
/**
+ * Convert a camera API1 list of sizes into an array of sizes
+ */
+ public static Size[] convertSizeListToArray(List<Camera.Size> sizeList) {
+ checkNotNull(sizeList, "sizeList must not be null");
+
+ Size[] array = new Size[sizeList.size()];
+ int ctr = 0;
+ for (Camera.Size s : sizeList) {
+ array[ctr++] = new Size(s.width, s.height);
+ }
+ return array;
+ }
+
+ /**
+ * Check if the camera API1 list of sizes contains a size with the given dimens.
+ */
+ public static boolean containsSize(List<Camera.Size> sizeList, int width, int height) {
+ checkNotNull(sizeList, "sizeList must not be null");
+ for (Camera.Size s : sizeList) {
+ if (s.height == height && s.width == width) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
* Returns the largest supported picture size, as compared by its area.
*/
public static Size getLargestSupportedJpegSizeByArea(Camera.Parameters params) {
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index 5c66753..eb8debb 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -190,7 +190,8 @@
try {
if (RequestHolder.jpegType(s)) {
Log.i(TAG, "Producing jpeg buffer...");
- LegacyCameraDevice.setSurfaceDimens(s, data.length, /*height*/1);
+ LegacyCameraDevice.setSurfaceDimens(s, data.length +
+ LegacyCameraDevice.nativeGetJpegFooterSize(), /*height*/1);
LegacyCameraDevice.setNextTimestamp(s, timestamp);
LegacyCameraDevice.produceFrame(s, data, data.length, /*height*/1,
CameraMetadataNative.NATIVE_JPEG_FORMAT);
@@ -665,10 +666,6 @@
}
mReceivedJpeg.close();
doJpegCapturePrepare(holder);
- if (!mReceivedJpeg.block(JPEG_FRAME_TIMEOUT)) {
- // TODO: report error to CameraDevice
- Log.e(TAG, "Hit timeout for jpeg callback!");
- }
}
/*
diff --git a/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java b/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
index 3f24b2c..b1b0f9b 100644
--- a/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
+++ b/core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
@@ -16,6 +16,7 @@
package android.hardware.camera2.legacy;
import android.graphics.ImageFormat;
+import android.graphics.RectF;
import android.graphics.SurfaceTexture;
import android.os.Environment;
import android.opengl.EGL14;
@@ -194,6 +195,9 @@
checkGlError("onDrawFrame start");
st.getTransformMatrix(mSTMatrix);
+ Matrix.setIdentityM(mMVPMatrix, /*smOffset*/0);
+
+ // Find intermediate buffer dimensions
Size dimens;
try {
dimens = LegacyCameraDevice.getTextureSize(st);
@@ -201,9 +205,6 @@
// Should never hit this.
throw new IllegalStateException("Surface abandoned, skipping drawFrame...", e);
}
-
- Matrix.setIdentityM(mMVPMatrix, /*smOffset*/0);
-
float texWidth = dimens.getWidth();
float texHeight = dimens.getHeight();
@@ -211,32 +212,30 @@
throw new IllegalStateException("Illegal intermediate texture with dimension of 0");
}
- // Find largest scaling factor from the intermediate texture dimension to the
- // output surface dimension. Scaling the intermediate texture by this allows
- // us to letterbox/pillerbox the output surface into the intermediate texture.
- float widthRatio = width / texWidth;
- float heightRatio = height / texHeight;
- float actual = (widthRatio < heightRatio) ? heightRatio : widthRatio;
+ // Letterbox or pillerbox output dimensions into intermediate dimensions.
+ RectF intermediate = new RectF(/*left*/0, /*top*/0, /*right*/texWidth, /*bottom*/texHeight);
+ RectF output = new RectF(/*left*/0, /*top*/0, /*right*/width, /*bottom*/height);
+ android.graphics.Matrix boxingXform = new android.graphics.Matrix();
+ boxingXform.setRectToRect(output, intermediate, android.graphics.Matrix.ScaleToFit.CENTER);
+ boxingXform.mapRect(output);
+
+ // Find scaling factor from pillerboxed/letterboxed output dimensions to intermediate
+ // buffer dimensions.
+ float scaleX = intermediate.width() / output.width();
+ float scaleY = intermediate.height() / output.height();
+
+ // Scale opposite dimension in clip coordinates so output is letterboxed/pillerboxed into
+ // the intermediate dimensions (rather than vice-versa).
+ Matrix.scaleM(mMVPMatrix, /*offset*/0, /*x*/scaleY, /*y*/scaleX, /*z*/1);
if (DEBUG) {
- Log.d(TAG, "Scaling factor " + actual + " used for " + width + "x" + height +
- " surface, intermediate buffer size is " + texWidth + "x" + texHeight);
+ Log.d(TAG, "Scaling factors (S_x = " + scaleX + ",S_y = " + scaleY + ") used for " +
+ width + "x" + height + " surface, intermediate buffer size is " + texWidth +
+ "x" + texHeight);
}
- // Set the viewport height and width to be the scaled intermediate texture dimensions.
- int viewportW = (int) (actual * texWidth);
- int viewportH = (int) (actual * texHeight);
-
- // Set the offset of the viewport so that the output surface is centered in the viewport.
- float dx = (width - viewportW) / 2f;
- float dy = (height - viewportH) / 2f;
-
- if (DEBUG) {
- Log.d(TAG, "Translation " + dx + "," + dy + " used for " + width + "x" + height +
- " surface");
- }
-
- GLES20.glViewport((int) dx, (int) dy, viewportW, viewportH);
+ // Set viewport to be output buffer dimensions
+ GLES20.glViewport(0, 0, width, height);
if (DEBUG) {
GLES20.glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
@@ -251,7 +250,7 @@
mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
GLES20.glVertexAttribPointer(maPositionHandle, VERTEX_POS_SIZE, GLES20.GL_FLOAT,
- /*normalized*/ false,TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+ /*normalized*/ false, TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
checkGlError("glVertexAttribPointer maPosition");
GLES20.glEnableVertexAttribArray(maPositionHandle);
checkGlError("glEnableVertexAttribArray maPositionHandle");
@@ -654,6 +653,8 @@
if (LegacyCameraDevice.containsSurfaceId(holder.surface, targetSurfaceIds)) {
makeCurrent(holder.eglSurface);
try {
+ LegacyCameraDevice.setSurfaceDimens(holder.surface, holder.width,
+ holder.height);
LegacyCameraDevice.setNextTimestamp(holder.surface, captureHolder.second);
drawFrame(mSurfaceTexture, holder.width, holder.height);
swapBuffers(holder.eglSurface);
diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 2e6b9ae..c0b7967 100644
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -339,6 +339,11 @@
* @see #isOutputSupportedFor(Class)
*/
public <T> Size[] getOutputSizes(Class<T> klass) {
+ // Image reader is "supported", but never for implementation-defined formats; return empty
+ if (android.media.ImageReader.class.isAssignableFrom(klass)) {
+ return new Size[0];
+ }
+
if (isOutputSupportedFor(klass) == false) {
return null;
}
diff --git a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
index 2391d3a..7abea36 100644
--- a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
+++ b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
@@ -77,11 +77,18 @@
/** Invalid port ID */
public static final int PORT_INVALID = -1;
- private static final int HDMI_DEVICE_TYPE_OTHER = 0;
- private static final int HDMI_DEVICE_TYPE_CEC = 1;
- private static final int HDMI_DEVICE_TYPE_MHL = 2;
+ private static final int HDMI_DEVICE_TYPE_CEC = 0;
+ private static final int HDMI_DEVICE_TYPE_MHL = 1;
+ private static final int HDMI_DEVICE_TYPE_HARDWARE = 2;
+
+ // Offset used for id value. MHL devices, for instance, will be assigned the value from
+ // ID_OFFSET_MHL.
+ private static final int ID_OFFSET_CEC = 0x0;
+ private static final int ID_OFFSET_MHL = 0x80;
+ private static final int ID_OFFSET_HARDWARE = 0xC0;
// Common parameters for all device.
+ private final int mId;
private final int mHdmiDeviceType;
private final int mPhysicalAddress;
private final int mPortId;
@@ -121,7 +128,7 @@
int deviceId = source.readInt();
int adopterId = source.readInt();
return new HdmiDeviceInfo(physicalAddress, portId, adopterId, deviceId);
- case HDMI_DEVICE_TYPE_OTHER:
+ case HDMI_DEVICE_TYPE_HARDWARE:
return new HdmiDeviceInfo(physicalAddress, portId);
default:
return null;
@@ -152,6 +159,7 @@
mPhysicalAddress = physicalAddress;
mPortId = portId;
+ mId = idForCecDevice(logicalAddress);
mLogicalAddress = logicalAddress;
mDeviceType = deviceType;
mVendorId = vendorId;
@@ -180,17 +188,18 @@
}
/**
- * Constructor. Used to initialize the instance for other device.
+ * Constructor. Used to initialize the instance for device representing hardware port.
*
- * @param physicalAddress physical address of HDMI device
+ * @param physicalAddress physical address of the port
* @param portId HDMI port ID (1 for HDMI1)
* @hide
*/
public HdmiDeviceInfo(int physicalAddress, int portId) {
- mHdmiDeviceType = HDMI_DEVICE_TYPE_OTHER;
+ mHdmiDeviceType = HDMI_DEVICE_TYPE_HARDWARE;
mPhysicalAddress = physicalAddress;
mPortId = portId;
+ mId = idForHardware(portId);
mLogicalAddress = -1;
mDeviceType = DEVICE_RESERVED;
mVendorId = 0;
@@ -216,17 +225,57 @@
mPhysicalAddress = physicalAddress;
mPortId = portId;
+ mId = idForMhlDevice(portId);
mLogicalAddress = -1;
mDeviceType = DEVICE_RESERVED;
mVendorId = 0;
mDevicePowerStatus = HdmiControlManager.POWER_STATUS_UNKNOWN;
- mDisplayName = "MHL";
+ mDisplayName = "Mobile";
mDeviceId = adopterId;
mAdopterId = deviceId;
}
/**
+ * Return the id of the device.
+ */
+ public int getId() {
+ return mId;
+ }
+
+ /**
+ * Return the id to be used for CEC device.
+ *
+ * @param address logical address of CEC device
+ * @return id for CEC device
+ */
+ public static int idForCecDevice(int address) {
+ // The id is generated based on the logical address.
+ return ID_OFFSET_CEC + address;
+ }
+
+ /**
+ * Return the id to be used for MHL device.
+ *
+ * @param portId port which the MHL device is connected to
+ * @return id for MHL device
+ */
+ public static int idForMhlDevice(int portId) {
+ // The id is generated based on the port id since there can be only one MHL device per port.
+ return ID_OFFSET_MHL + portId;
+ }
+
+ /**
+ * Return the id to be used for hardware port.
+ *
+ * @param portId port id
+ * @return id for hardware port
+ */
+ public static int idForHardware(int portId) {
+ return ID_OFFSET_HARDWARE + portId;
+ }
+
+ /**
* Return the CEC logical address of the device.
*/
public int getLogicalAddress() {
@@ -367,25 +416,27 @@
switch (mHdmiDeviceType) {
case HDMI_DEVICE_TYPE_CEC:
s.append("CEC: ");
- s.append("logical_address: ").append(mLogicalAddress).append(", ");
- s.append("device_type: ").append(mDeviceType).append(", ");
- s.append("vendor_id: ").append(mVendorId).append(", ");
- s.append("display_name: ").append(mDisplayName).append(", ");
- s.append("power_status: ").append(mDevicePowerStatus).append(", ");
+ s.append("logical_address: ").append(String.format("0x%02X", mLogicalAddress));
+ s.append(" ");
+ s.append("device_type: ").append(mDeviceType).append(" ");
+ s.append("vendor_id: ").append(mVendorId).append(" ");
+ s.append("display_name: ").append(mDisplayName).append(" ");
+ s.append("power_status: ").append(mDevicePowerStatus).append(" ");
break;
case HDMI_DEVICE_TYPE_MHL:
s.append("MHL: ");
+ s.append("device_id: ").append(String.format("0x%04X", mDeviceId)).append(" ");
+ s.append("adopter_id: ").append(String.format("0x%04X", mAdopterId)).append(" ");
break;
- case HDMI_DEVICE_TYPE_OTHER:
- s.append("Other: ");
- s.append("device_id: ").append(mDeviceId).append(", ");
- s.append("adopter_id: ").append(mAdopterId).append(", ");
+ case HDMI_DEVICE_TYPE_HARDWARE:
+ s.append("Hardware: ");
break;
default:
return "";
}
- s.append("physical_address: ").append(mPhysicalAddress).append(", ");
+ s.append("physical_address: ").append(String.format("0x%04X", mPhysicalAddress));
+ s.append(" ");
s.append("port_id: ").append(mPortId);
return s.toString();
}
diff --git a/core/java/android/hardware/hdmi/IHdmiControlService.aidl b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
index 5422bc2..17f290b 100644
--- a/core/java/android/hardware/hdmi/IHdmiControlService.aidl
+++ b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
@@ -43,7 +43,7 @@
void addHotplugEventListener(IHdmiHotplugEventListener listener);
void removeHotplugEventListener(IHdmiHotplugEventListener listener);
void addDeviceEventListener(IHdmiDeviceEventListener listener);
- void deviceSelect(int logicalAddress, IHdmiControlCallback callback);
+ void deviceSelect(int deviceId, IHdmiControlCallback callback);
void portSelect(int portId, IHdmiControlCallback callback);
void sendKeyEvent(int deviceType, int keyCode, boolean isPressed);
List<HdmiPortInfo> getPortInfo();
diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java
index 2d82cba..7dd105a 100644
--- a/core/java/android/hardware/location/GeofenceHardware.java
+++ b/core/java/android/hardware/location/GeofenceHardware.java
@@ -15,6 +15,7 @@
*/
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
import android.os.Build;
import android.os.RemoteException;
@@ -43,7 +44,10 @@
* an appropriate transition would be triggered. The "reasonably confident" parameter
* depends on the hardware system and the positioning algorithms used.
* For instance, {@link #MONITORING_TYPE_GPS_HARDWARE} uses 95% as a confidence level.
+ *
+ * @hide
*/
+@SystemApi
public final class GeofenceHardware {
private IGeofenceHardware mService;
@@ -162,9 +166,7 @@
private HashMap<GeofenceHardwareMonitorCallback, GeofenceHardwareMonitorCallbackWrapper>
mMonitorCallbacks = new HashMap<GeofenceHardwareMonitorCallback,
GeofenceHardwareMonitorCallbackWrapper>();
- /**
- * @hide
- */
+
public GeofenceHardware(IGeofenceHardware service) {
mService = service;
}
diff --git a/core/java/android/hardware/location/GeofenceHardwareCallback.java b/core/java/android/hardware/location/GeofenceHardwareCallback.java
index 6cad3da..a2a7ed0 100644
--- a/core/java/android/hardware/location/GeofenceHardwareCallback.java
+++ b/core/java/android/hardware/location/GeofenceHardwareCallback.java
@@ -16,11 +16,15 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
/**
* The callback class associated with the APIs in {@link GeofenceHardware}
+ *
+ * @hide
*/
+@SystemApi
public abstract class GeofenceHardwareCallback {
/**
* The callback called when there is a transition to report for the specific
diff --git a/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java b/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
index f927027..d7daa10 100644
--- a/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
+++ b/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
@@ -16,12 +16,16 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
/**
* The callback class associated with the status change of hardware monitors
* in {@link GeofenceHardware}
+ *
+ * @hide
*/
+@SystemApi
public abstract class GeofenceHardwareMonitorCallback {
/**
* The callback called when the state of a monitoring system changes.
diff --git a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
index 9c460d2..7079237 100644
--- a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
+++ b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
@@ -16,13 +16,17 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
import android.os.Parcel;
import android.os.Parcelable;
/**
* A class that represents an event for each change in the state of a monitoring system.
+ *
+ * @hide
*/
+@SystemApi
public class GeofenceHardwareMonitorEvent implements Parcelable {
private final int mMonitoringType;
private final int mMonitoringStatus;
diff --git a/core/java/android/hardware/location/GeofenceHardwareRequest.java b/core/java/android/hardware/location/GeofenceHardwareRequest.java
index 887c4ad..68545a8 100644
--- a/core/java/android/hardware/location/GeofenceHardwareRequest.java
+++ b/core/java/android/hardware/location/GeofenceHardwareRequest.java
@@ -16,12 +16,16 @@
package android.hardware.location;
+import android.annotation.SystemApi;
+
/**
* This class represents the characteristics of the geofence.
*
* <p> Use this in conjunction with {@link GeofenceHardware} APIs.
+ *
+ * @hide
*/
-
+@SystemApi
public final class GeofenceHardwareRequest {
static final int GEOFENCE_TYPE_CIRCLE = 0;
private int mType;
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 8423d09..ba811b7 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -640,10 +640,13 @@
* You can call this to try to enable hardware accelerated drawing for
* your IME. This must be set before {@link #onCreate}, so you
* will typically call it in your constructor. It is not always possible
- * to use hardware acclerated drawing in an IME (for example on low-end
+ * to use hardware accelerated drawing in an IME (for example on low-end
* devices that do not have the resources to support this), so the call
* returns true if it succeeds otherwise false if you will need to draw
* in software. You must be able to handle either case.
+ *
+ * @deprecated Starting in API 21, hardware acceleration is always enabled
+ * on capable devices.
*/
public boolean enableHardwareAcceleration() {
if (mWindow != null) {
diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java
index 49a307e..71df60a 100644
--- a/core/java/android/net/DhcpResults.java
+++ b/core/java/android/net/DhcpResults.java
@@ -16,13 +16,15 @@
package android.net;
+import android.net.NetworkUtils;
import android.os.Parcelable;
import android.os.Parcel;
import android.text.TextUtils;
import android.util.Log;
import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.net.Inet4Address;
+import java.util.Objects;
/**
* A simple object for retrieving the results of a DHCP request.
@@ -30,38 +32,34 @@
* TODO - remove when DhcpInfo is deprecated. Move the remaining api to LinkProperties.
* @hide
*/
-public class DhcpResults implements Parcelable {
+public class DhcpResults extends StaticIpConfiguration {
private static final String TAG = "DhcpResults";
- public final LinkProperties linkProperties;
-
public InetAddress serverAddress;
- /**
- * Vendor specific information (from RFC 2132).
- */
+ /** Vendor specific information (from RFC 2132). */
public String vendorInfo;
public int leaseDuration;
public DhcpResults() {
- linkProperties = new LinkProperties();
+ super();
+ }
+
+ public DhcpResults(StaticIpConfiguration source) {
+ super(source);
}
/** copy constructor */
public DhcpResults(DhcpResults source) {
- if (source != null) {
- linkProperties = new LinkProperties(source.linkProperties);
- serverAddress = source.serverAddress;
- leaseDuration = source.leaseDuration;
- vendorInfo = source.vendorInfo;
- } else {
- linkProperties = new LinkProperties();
- }
- }
+ super(source);
- public DhcpResults(LinkProperties lp) {
- linkProperties = new LinkProperties(lp);
+ if (source != null) {
+ // All these are immutable, so no need to make copies.
+ serverAddress = source.serverAddress;
+ vendorInfo = source.vendorInfo;
+ leaseDuration = source.leaseDuration;
+ }
}
/**
@@ -70,14 +68,10 @@
* being empty.
*/
public void updateFromDhcpRequest(DhcpResults orig) {
- if (orig == null || orig.linkProperties == null) return;
- if (linkProperties.getRoutes().size() == 0) {
- for (RouteInfo r : orig.linkProperties.getRoutes()) linkProperties.addRoute(r);
- }
- if (linkProperties.getDnsServers().size() == 0) {
- for (InetAddress d : orig.linkProperties.getDnsServers()) {
- linkProperties.addDnsServer(d);
- }
+ if (orig == null) return;
+ if (gateway == null) gateway = orig.gateway;
+ if (dnsServers.size() == 0) {
+ dnsServers.addAll(orig.dnsServers);
}
}
@@ -94,15 +88,14 @@
}
public void clear() {
- linkProperties.clear();
- serverAddress = null;
+ super.clear();
vendorInfo = null;
leaseDuration = 0;
}
@Override
public String toString() {
- StringBuffer str = new StringBuffer(linkProperties.toString());
+ StringBuffer str = new StringBuffer(super.toString());
str.append(" DHCP server ").append(serverAddress);
str.append(" Vendor info ").append(vendorInfo);
@@ -119,58 +112,19 @@
DhcpResults target = (DhcpResults)obj;
- if (linkProperties == null) {
- if (target.linkProperties != null) return false;
- } else if (!linkProperties.equals(target.linkProperties)) return false;
- if (serverAddress == null) {
- if (target.serverAddress != null) return false;
- } else if (!serverAddress.equals(target.serverAddress)) return false;
- if (vendorInfo == null) {
- if (target.vendorInfo != null) return false;
- } else if (!vendorInfo.equals(target.vendorInfo)) return false;
- if (leaseDuration != target.leaseDuration) return false;
-
- return true;
- }
-
- /** Implement the Parcelable interface */
- public int describeContents() {
- return 0;
- }
-
- /** Implement the Parcelable interface */
- public void writeToParcel(Parcel dest, int flags) {
- linkProperties.writeToParcel(dest, flags);
-
- dest.writeInt(leaseDuration);
-
- if (serverAddress != null) {
- dest.writeByte((byte)1);
- dest.writeByteArray(serverAddress.getAddress());
- } else {
- dest.writeByte((byte)0);
- }
-
- dest.writeString(vendorInfo);
+ return super.equals((StaticIpConfiguration) obj) &&
+ Objects.equals(serverAddress, target.serverAddress) &&
+ Objects.equals(vendorInfo, target.vendorInfo) &&
+ leaseDuration == target.leaseDuration;
}
/** Implement the Parcelable interface */
public static final Creator<DhcpResults> CREATOR =
new Creator<DhcpResults>() {
public DhcpResults createFromParcel(Parcel in) {
- DhcpResults prop = new DhcpResults((LinkProperties)in.readParcelable(null));
-
- prop.leaseDuration = in.readInt();
-
- if (in.readByte() == 1) {
- try {
- prop.serverAddress = InetAddress.getByAddress(in.createByteArray());
- } catch (UnknownHostException e) {}
- }
-
- prop.vendorInfo = in.readString();
-
- return prop;
+ DhcpResults dhcpResults = new DhcpResults();
+ readFromParcel(dhcpResults, in);
+ return dhcpResults;
}
public DhcpResults[] newArray(int size) {
@@ -178,33 +132,39 @@
}
};
- // Utils for jni population - false on success
- public void setInterfaceName(String interfaceName) {
- linkProperties.setInterfaceName(interfaceName);
+ /** Implement the Parcelable interface */
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeInt(leaseDuration);
+ NetworkUtils.parcelInetAddress(dest, serverAddress, flags);
+ dest.writeString(vendorInfo);
}
- public boolean addLinkAddress(String addrString, int prefixLength) {
- InetAddress addr;
+ private static void readFromParcel(DhcpResults dhcpResults, Parcel in) {
+ StaticIpConfiguration.readFromParcel(dhcpResults, in);
+ dhcpResults.leaseDuration = in.readInt();
+ dhcpResults.serverAddress = NetworkUtils.unparcelInetAddress(in);
+ dhcpResults.vendorInfo = in.readString();
+ }
+
+ // Utils for jni population - false on success
+ // Not part of the superclass because they're only used by the JNI iterface to the DHCP daemon.
+ public boolean setIpAddress(String addrString, int prefixLength) {
try {
- addr = NetworkUtils.numericToInetAddress(addrString);
- } catch (IllegalArgumentException e) {
- Log.e(TAG, "addLinkAddress failed with addrString " + addrString);
+ Inet4Address addr = (Inet4Address) NetworkUtils.numericToInetAddress(addrString);
+ ipAddress = new LinkAddress(addr, prefixLength);
+ } catch (IllegalArgumentException|ClassCastException e) {
+ Log.e(TAG, "setIpAddress failed with addrString " + addrString + "/" + prefixLength);
return true;
}
-
- LinkAddress linkAddress = new LinkAddress(addr, prefixLength);
- linkProperties.addLinkAddress(linkAddress);
-
- RouteInfo routeInfo = new RouteInfo(linkAddress);
- linkProperties.addRoute(routeInfo);
return false;
}
- public boolean addGateway(String addrString) {
+ public boolean setGateway(String addrString) {
try {
- linkProperties.addRoute(new RouteInfo(NetworkUtils.numericToInetAddress(addrString)));
+ gateway = NetworkUtils.numericToInetAddress(addrString);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "addGateway failed with addrString " + addrString);
+ Log.e(TAG, "setGateway failed with addrString " + addrString);
return true;
}
return false;
@@ -213,7 +173,7 @@
public boolean addDns(String addrString) {
if (TextUtils.isEmpty(addrString) == false) {
try {
- linkProperties.addDnsServer(NetworkUtils.numericToInetAddress(addrString));
+ dnsServers.add(NetworkUtils.numericToInetAddress(addrString));
} catch (IllegalArgumentException e) {
Log.e(TAG, "addDns failed with addrString " + addrString);
return true;
@@ -241,6 +201,6 @@
}
public void setDomains(String domains) {
- linkProperties.setDomains(domains);
+ domains = domains;
}
}
diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java
index 608ca28..d965f27 100644
--- a/core/java/android/net/EthernetManager.java
+++ b/core/java/android/net/EthernetManager.java
@@ -21,7 +21,6 @@
import android.net.IpConfiguration;
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
-import android.net.LinkProperties;
import android.os.RemoteException;
/**
@@ -52,16 +51,12 @@
*/
public IpConfiguration getConfiguration() {
if (mService == null) {
- return new IpConfiguration(IpAssignment.UNASSIGNED,
- ProxySettings.UNASSIGNED,
- new LinkProperties());
+ return new IpConfiguration();
}
try {
return mService.getConfiguration();
} catch (RemoteException e) {
- return new IpConfiguration(IpAssignment.UNASSIGNED,
- ProxySettings.UNASSIGNED,
- new LinkProperties());
+ return new IpConfiguration();
}
}
diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java
index 4730bab..fe69f296 100644
--- a/core/java/android/net/IpConfiguration.java
+++ b/core/java/android/net/IpConfiguration.java
@@ -16,7 +16,7 @@
package android.net;
-import android.net.LinkProperties;
+import android.net.StaticIpConfiguration;
import android.os.Parcel;
import android.os.Parcelable;
@@ -31,7 +31,7 @@
public enum IpAssignment {
/* Use statically configured IP settings. Configuration can be accessed
- * with linkProperties */
+ * with staticIpConfiguration */
STATIC,
/* Use dynamically configured IP settigns */
DHCP,
@@ -42,12 +42,14 @@
public IpAssignment ipAssignment;
+ public StaticIpConfiguration staticIpConfiguration;
+
public enum ProxySettings {
/* No proxy is to be used. Any existing proxy settings
* should be cleared. */
NONE,
/* Use statically configured proxy. Configuration can be accessed
- * with linkProperties */
+ * with httpProxy. */
STATIC,
/* no proxy details are assigned, this is used to indicate
* that any existing proxy settings should be retained */
@@ -59,30 +61,69 @@
public ProxySettings proxySettings;
- public LinkProperties linkProperties;
+ public ProxyInfo httpProxy;
- public IpConfiguration(IpConfiguration source) {
- if (source != null) {
- ipAssignment = source.ipAssignment;
- proxySettings = source.proxySettings;
- linkProperties = new LinkProperties(source.linkProperties);
- } else {
- ipAssignment = IpAssignment.UNASSIGNED;
- proxySettings = ProxySettings.UNASSIGNED;
- linkProperties = new LinkProperties();
- }
+ private void init(IpAssignment ipAssignment,
+ ProxySettings proxySettings,
+ StaticIpConfiguration staticIpConfiguration,
+ ProxyInfo httpProxy) {
+ this.ipAssignment = ipAssignment;
+ this.proxySettings = proxySettings;
+ this.staticIpConfiguration = (staticIpConfiguration == null) ?
+ null : new StaticIpConfiguration(staticIpConfiguration);
+ this.httpProxy = (httpProxy == null) ?
+ null : new ProxyInfo(httpProxy);
}
public IpConfiguration() {
- this(null);
+ init(IpAssignment.UNASSIGNED, ProxySettings.UNASSIGNED, null, null);
}
public IpConfiguration(IpAssignment ipAssignment,
ProxySettings proxySettings,
- LinkProperties linkProperties) {
+ StaticIpConfiguration staticIpConfiguration,
+ ProxyInfo httpProxy) {
+ init(ipAssignment, proxySettings, staticIpConfiguration, httpProxy);
+ }
+
+ public IpConfiguration(IpConfiguration source) {
+ this();
+ if (source != null) {
+ init(source.ipAssignment, source.proxySettings,
+ source.staticIpConfiguration, source.httpProxy);
+ }
+ }
+
+ public IpAssignment getIpAssignment() {
+ return ipAssignment;
+ }
+
+ public void setIpAssignment(IpAssignment ipAssignment) {
this.ipAssignment = ipAssignment;
+ }
+
+ public StaticIpConfiguration getStaticIpConfiguration() {
+ return staticIpConfiguration;
+ }
+
+ public void setStaticIpConfiguration(StaticIpConfiguration staticIpConfiguration) {
+ this.staticIpConfiguration = staticIpConfiguration;
+ }
+
+ public ProxySettings getProxySettings() {
+ return proxySettings;
+ }
+
+ public void setProxySettings(ProxySettings proxySettings) {
this.proxySettings = proxySettings;
- this.linkProperties = new LinkProperties(linkProperties);
+ }
+
+ public ProxyInfo getHttpProxy() {
+ return httpProxy;
+ }
+
+ public void setHttpProxy(ProxyInfo httpProxy) {
+ this.httpProxy = httpProxy;
}
@Override
@@ -90,10 +131,16 @@
StringBuilder sbuf = new StringBuilder();
sbuf.append("IP assignment: " + ipAssignment.toString());
sbuf.append("\n");
+ if (staticIpConfiguration != null) {
+ sbuf.append("Static configuration: " + staticIpConfiguration.toString());
+ sbuf.append("\n");
+ }
sbuf.append("Proxy settings: " + proxySettings.toString());
sbuf.append("\n");
- sbuf.append(linkProperties.toString());
- sbuf.append("\n");
+ if (httpProxy != null) {
+ sbuf.append("HTTP proxy: " + httpProxy.toString());
+ sbuf.append("\n");
+ }
return sbuf.toString();
}
@@ -111,14 +158,16 @@
IpConfiguration other = (IpConfiguration) o;
return this.ipAssignment == other.ipAssignment &&
this.proxySettings == other.proxySettings &&
- Objects.equals(this.linkProperties, other.linkProperties);
+ Objects.equals(this.staticIpConfiguration, other.staticIpConfiguration) &&
+ Objects.equals(this.httpProxy, other.httpProxy);
}
@Override
public int hashCode() {
- return 13 + (linkProperties != null ? linkProperties.hashCode() : 0) +
+ return 13 + (staticIpConfiguration != null ? staticIpConfiguration.hashCode() : 0) +
17 * ipAssignment.ordinal() +
- 47 * proxySettings.ordinal();
+ 47 * proxySettings.ordinal() +
+ 83 * httpProxy.hashCode();
}
/** Implement the Parcelable interface */
@@ -130,7 +179,8 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(ipAssignment.name());
dest.writeString(proxySettings.name());
- dest.writeParcelable(linkProperties, flags);
+ dest.writeParcelable(staticIpConfiguration, flags);
+ dest.writeParcelable(httpProxy, flags);
}
/** Implement the Parcelable interface */
@@ -140,7 +190,8 @@
IpConfiguration config = new IpConfiguration();
config.ipAssignment = IpAssignment.valueOf(in.readString());
config.proxySettings = ProxySettings.valueOf(in.readString());
- config.linkProperties = in.readParcelable(null);
+ config.staticIpConfiguration = in.readParcelable(null);
+ config.httpProxy = in.readParcelable(null);
return config;
}
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 47b74ab..3d6a132 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -17,6 +17,7 @@
package android.net;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.net.ProxyInfo;
import android.os.Parcelable;
import android.os.Parcel;
@@ -54,6 +55,12 @@
private ArrayList<RouteInfo> mRoutes = new ArrayList<RouteInfo>();
private ProxyInfo mHttpProxy;
private int mMtu;
+ // in the format "rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max"
+ private String mTcpBufferSizes;
+
+ private static final int MIN_MTU = 68;
+ private static final int MIN_MTU_V6 = 1280;
+ private static final int MAX_MTU = 10000;
// Stores the properties of links that are "stacked" above this link.
// Indexed by interface name to allow modification and to prevent duplicates being added.
@@ -100,6 +107,7 @@
addStackedLink(l);
}
setMtu(source.getMtu());
+ mTcpBufferSizes = source.mTcpBufferSizes;
}
}
@@ -124,7 +132,7 @@
*
* @return The interface name set for this link or {@code null}.
*/
- public String getInterfaceName() {
+ public @Nullable String getInterfaceName() {
return mIfaceName;
}
@@ -346,6 +354,29 @@
return mMtu;
}
+ /**
+ * Sets the tcp buffers sizes to be used when this link is the system default.
+ * Should be of the form "rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max".
+ *
+ * @param tcpBufferSizes The tcp buffers sizes to use.
+ *
+ * @hide
+ */
+ public void setTcpBufferSizes(String tcpBufferSizes) {
+ mTcpBufferSizes = tcpBufferSizes;
+ }
+
+ /**
+ * Gets the tcp buffer sizes.
+ *
+ * @return the tcp buffer sizes to use when this link is the system default.
+ *
+ * @hide
+ */
+ public String getTcpBufferSizes() {
+ return mTcpBufferSizes;
+ }
+
private RouteInfo routeWithInterface(RouteInfo route) {
return new RouteInfo(
route.getDestination(),
@@ -504,6 +535,7 @@
mHttpProxy = null;
mStackedLinks.clear();
mMtu = 0;
+ mTcpBufferSizes = null;
}
/**
@@ -529,6 +561,11 @@
String mtu = " MTU: " + mMtu;
+ String tcpBuffSizes = "";
+ if (mTcpBufferSizes != null) {
+ tcpBuffSizes = " TcpBufferSizes: " + mTcpBufferSizes;
+ }
+
String routes = " Routes: [";
for (RouteInfo route : mRoutes) routes += route.toString() + ",";
routes += "] ";
@@ -543,7 +580,7 @@
stacked += "] ";
}
return "{" + ifaceName + linkAddresses + routes + dns + domainName + mtu
- + proxy + stacked + "}";
+ + tcpBuffSizes + proxy + stacked + "}";
}
/**
@@ -751,6 +788,17 @@
return getMtu() == target.getMtu();
}
+ /**
+ * Compares this {@code LinkProperties} Tcp buffer sizes against the target.
+ *
+ * @param target LinkProperties to compare.
+ * @return {@code true} if both are identical, {@code false} otherwise.
+ * @hide
+ */
+ public boolean isIdenticalTcpBufferSizes(LinkProperties target) {
+ return Objects.equals(mTcpBufferSizes, target.mTcpBufferSizes);
+ }
+
@Override
/**
* Compares this {@code LinkProperties} instance against the target
@@ -783,7 +831,8 @@
isIdenticalRoutes(target) &&
isIdenticalHttpProxy(target) &&
isIdenticalStackedLinks(target) &&
- isIdenticalMtu(target);
+ isIdenticalMtu(target) &&
+ isIdenticalTcpBufferSizes(target);
}
/**
@@ -918,7 +967,8 @@
+ mRoutes.size() * 41
+ ((null == mHttpProxy) ? 0 : mHttpProxy.hashCode())
+ mStackedLinks.hashCode() * 47)
- + mMtu * 51;
+ + mMtu * 51
+ + ((null == mTcpBufferSizes) ? 0 : mTcpBufferSizes.hashCode());
}
/**
@@ -937,6 +987,7 @@
}
dest.writeString(mDomains);
dest.writeInt(mMtu);
+ dest.writeString(mTcpBufferSizes);
dest.writeInt(mRoutes.size());
for(RouteInfo route : mRoutes) {
dest.writeParcelable(route, flags);
@@ -976,6 +1027,7 @@
}
netProp.setDomains(in.readString());
netProp.setMtu(in.readInt());
+ netProp.setTcpBufferSizes(in.readString());
addressCount = in.readInt();
for (int i=0; i<addressCount; i++) {
netProp.addRoute((RouteInfo)in.readParcelable(null));
@@ -995,4 +1047,17 @@
return new LinkProperties[size];
}
};
+
+ /**
+ * Check the valid MTU range based on IPv4 or IPv6.
+ * @hide
+ */
+ public static boolean isValidMtu(int mtu, boolean ipv6) {
+ if (ipv6) {
+ if ((mtu >= MIN_MTU_V6 && mtu <= MAX_MTU)) return true;
+ } else {
+ if ((mtu >= MIN_MTU && mtu <= MAX_MTU)) return true;
+ }
+ return false;
+ }
}
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 663aa15..54d8676 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.Locale;
+import android.os.Parcel;
import android.util.Log;
import android.util.Pair;
@@ -203,6 +204,32 @@
}
/**
+ * Writes an InetAddress to a parcel. The address may be null. This is likely faster than
+ * calling writeSerializable.
+ */
+ protected static void parcelInetAddress(Parcel parcel, InetAddress address, int flags) {
+ byte[] addressArray = (address != null) ? address.getAddress() : null;
+ parcel.writeByteArray(addressArray);
+ }
+
+ /**
+ * Reads an InetAddress from a parcel. Returns null if the address that was written was null
+ * or if the data is invalid.
+ */
+ protected static InetAddress unparcelInetAddress(Parcel in) {
+ byte[] addressArray = in.createByteArray();
+ if (addressArray == null) {
+ return null;
+ }
+ try {
+ return InetAddress.getByAddress(addressArray);
+ } catch (UnknownHostException e) {
+ return null;
+ }
+ }
+
+
+ /**
* Masks a raw IP address byte array with the specified prefix length.
*/
public static void maskRawAddress(byte[] array, int prefixLength) {
diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java
index 129248c..a4ec80c 100644
--- a/core/java/android/net/RouteInfo.java
+++ b/core/java/android/net/RouteInfo.java
@@ -49,9 +49,8 @@
public final class RouteInfo implements Parcelable {
/**
* The IP destination address for this route.
- * TODO: Make this an IpPrefix.
*/
- private final LinkAddress mDestination;
+ private final IpPrefix mDestination;
/**
* The gateway address for this route.
@@ -81,26 +80,15 @@
* @param gateway the IP address to route packets through
* @param iface the interface name to send packets on
*
- * TODO: Convert to use IpPrefix.
- *
* @hide
*/
public RouteInfo(IpPrefix destination, InetAddress gateway, String iface) {
- this(destination == null ? null :
- new LinkAddress(destination.getAddress(), destination.getPrefixLength()),
- gateway, iface);
- }
-
- /**
- * @hide
- */
- public RouteInfo(LinkAddress destination, InetAddress gateway, String iface) {
if (destination == null) {
if (gateway != null) {
if (gateway instanceof Inet4Address) {
- destination = new LinkAddress(Inet4Address.ANY, 0);
+ destination = new IpPrefix(Inet4Address.ANY, 0);
} else {
- destination = new LinkAddress(Inet6Address.ANY, 0);
+ destination = new IpPrefix(Inet6Address.ANY, 0);
}
} else {
// no destination, no gateway. invalid.
@@ -108,6 +96,9 @@
destination);
}
}
+ // TODO: set mGateway to null if there is no gateway. This is more correct, saves space, and
+ // matches the documented behaviour. Before we can do this we need to fix all callers (e.g.,
+ // ConnectivityService) to stop doing things like r.getGateway().equals(), ... .
if (gateway == null) {
if (destination.getAddress() instanceof Inet4Address) {
gateway = Inet4Address.ANY;
@@ -117,20 +108,28 @@
}
mHasGateway = (!gateway.isAnyLocalAddress());
- mDestination = new LinkAddress(NetworkUtils.getNetworkPart(destination.getAddress(),
- destination.getPrefixLength()), destination.getPrefixLength());
if ((destination.getAddress() instanceof Inet4Address &&
(gateway instanceof Inet4Address == false)) ||
(destination.getAddress() instanceof Inet6Address &&
(gateway instanceof Inet6Address == false))) {
throw new IllegalArgumentException("address family mismatch in RouteInfo constructor");
}
- mGateway = gateway;
- mInterface = iface;
+ mDestination = destination; // IpPrefix objects are immutable.
+ mGateway = gateway; // InetAddress objects are immutable.
+ mInterface = iface; // Strings are immutable.
mIsHost = isHost();
}
/**
+ * @hide
+ */
+ public RouteInfo(LinkAddress destination, InetAddress gateway, String iface) {
+ this(destination == null ? null :
+ new IpPrefix(destination.getAddress(), destination.getPrefixLength()),
+ gateway, iface);
+ }
+
+ /**
* Constructs a {@code RouteInfo} object.
*
* If destination is null, then gateway must be specified and the
@@ -164,7 +163,7 @@
* @hide
*/
public RouteInfo(InetAddress gateway) {
- this((LinkAddress) null, gateway, null);
+ this((IpPrefix) null, gateway, null);
}
/**
@@ -200,9 +199,9 @@
if (host == null) return null;
if (host instanceof Inet4Address) {
- return new RouteInfo(new LinkAddress(host, 32), gateway, iface);
+ return new RouteInfo(new IpPrefix(host, 32), gateway, iface);
} else {
- return new RouteInfo(new LinkAddress(host, 128), gateway, iface);
+ return new RouteInfo(new IpPrefix(host, 128), gateway, iface);
}
}
@@ -219,7 +218,7 @@
* @return {@link IpPrefix} specifying the destination. This is never {@code null}.
*/
public IpPrefix getDestination() {
- return new IpPrefix(mDestination.getAddress(), mDestination.getPrefixLength());
+ return mDestination;
}
/**
@@ -227,7 +226,7 @@
* @hide
*/
public LinkAddress getDestinationLinkAddress() {
- return mDestination;
+ return new LinkAddress(mDestination.getAddress(), mDestination.getPrefixLength());
}
/**
@@ -363,7 +362,7 @@
RouteInfo target = (RouteInfo) obj;
- return Objects.equals(mDestination, target.getDestinationLinkAddress()) &&
+ return Objects.equals(mDestination, target.getDestination()) &&
Objects.equals(mGateway, target.getGateway()) &&
Objects.equals(mInterface, target.getInterface());
}
@@ -388,16 +387,9 @@
* Implement the Parcelable interface
*/
public void writeToParcel(Parcel dest, int flags) {
- dest.writeByteArray(mDestination.getAddress().getAddress());
- dest.writeInt(mDestination.getPrefixLength());
-
- if (mGateway == null) {
- dest.writeByte((byte) 0);
- } else {
- dest.writeByte((byte) 1);
- dest.writeByteArray(mGateway.getAddress());
- }
-
+ dest.writeParcelable(mDestination, flags);
+ byte[] gatewayBytes = (mGateway == null) ? null : mGateway.getAddress();
+ dest.writeByteArray(gatewayBytes);
dest.writeString(mInterface);
}
@@ -407,33 +399,16 @@
public static final Creator<RouteInfo> CREATOR =
new Creator<RouteInfo>() {
public RouteInfo createFromParcel(Parcel in) {
- InetAddress destAddr = null;
- int prefix = 0;
+ IpPrefix dest = in.readParcelable(null);
+
InetAddress gateway = null;
-
byte[] addr = in.createByteArray();
- prefix = in.readInt();
-
try {
- destAddr = InetAddress.getByAddress(addr);
+ gateway = InetAddress.getByAddress(addr);
} catch (UnknownHostException e) {}
- if (in.readByte() == 1) {
- addr = in.createByteArray();
-
- try {
- gateway = InetAddress.getByAddress(addr);
- } catch (UnknownHostException e) {}
- }
-
String iface = in.readString();
- LinkAddress dest = null;
-
- if (destAddr != null) {
- dest = new LinkAddress(destAddr, prefix);
- }
-
return new RouteInfo(dest, gateway, iface);
}
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java
index 12e8791..b0278d3 100644
--- a/core/java/android/net/SSLCertificateSocketFactory.java
+++ b/core/java/android/net/SSLCertificateSocketFactory.java
@@ -135,8 +135,7 @@
* disabled, using an optional handshake timeout and SSL session cache.
*
* <p class="caution"><b>Warning:</b> Sockets created using this factory
- * are vulnerable to man-in-the-middle attacks!</p>. The caller must implement
- * its own verification.
+ * are vulnerable to man-in-the-middle attacks!</p>
*
* @param handshakeTimeoutMillis to use for SSL connection handshake, or 0
* for none. The socket timeout is reset to 0 after the handshake.
@@ -224,6 +223,8 @@
if (mInsecureFactory == null) {
if (mSecure) {
Log.w(TAG, "*** BYPASSING SSL SECURITY CHECKS (socket.relaxsslcheck=yes) ***");
+ } else {
+ Log.w(TAG, "Bypassing SSL security checks at caller's request");
}
mInsecureFactory = makeSocketFactory(mKeyManagers, INSECURE_TRUST_MANAGER);
}
@@ -430,7 +431,6 @@
s.setAlpnProtocols(mAlpnProtocols);
s.setHandshakeTimeout(mHandshakeTimeoutMillis);
s.setChannelIdPrivateKey(mChannelIdPrivateKey);
- s.setHostname(host);
if (mSecure) {
verifyHostname(s, host);
}
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
new file mode 100644
index 0000000..5a273cf
--- /dev/null
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.net.LinkAddress;
+import android.os.Parcelable;
+import android.os.Parcel;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Class that describes static IP configuration.
+ *
+ * This class is different from LinkProperties because it represents
+ * configuration intent. The general contract is that if we can represent
+ * a configuration here, then we should be able to configure it on a network.
+ * The intent is that it closely match the UI we have for configuring networks.
+ *
+ * In contrast, LinkProperties represents current state. It is much more
+ * expressive. For example, it supports multiple IP addresses, multiple routes,
+ * stacked interfaces, and so on. Because LinkProperties is so expressive,
+ * using it to represent configuration intent as well as current state causes
+ * problems. For example, we could unknowingly save a configuration that we are
+ * not in fact capable of applying, or we could save a configuration that the
+ * UI cannot display, which has the potential for malicious code to hide
+ * hostile or unexpected configuration from the user: see, for example,
+ * http://b/12663469 and http://b/16893413 .
+ *
+ * @hide
+ */
+public class StaticIpConfiguration implements Parcelable {
+ public LinkAddress ipAddress;
+ public InetAddress gateway;
+ public final ArrayList<InetAddress> dnsServers;
+ public String domains;
+
+ public StaticIpConfiguration() {
+ dnsServers = new ArrayList<InetAddress>();
+ }
+
+ public StaticIpConfiguration(StaticIpConfiguration source) {
+ this();
+ if (source != null) {
+ // All of these except dnsServers are immutable, so no need to make copies.
+ ipAddress = source.ipAddress;
+ gateway = source.gateway;
+ dnsServers.addAll(source.dnsServers);
+ domains = source.domains;
+ }
+ }
+
+ public void clear() {
+ ipAddress = null;
+ gateway = null;
+ dnsServers.clear();
+ domains = null;
+ }
+
+ /**
+ * Returns the network routes specified by this object. Will typically include a
+ * directly-connected route for the IP address's local subnet and a default route.
+ */
+ public List<RouteInfo> getRoutes(String iface) {
+ List<RouteInfo> routes = new ArrayList<RouteInfo>(2);
+ if (ipAddress != null) {
+ routes.add(new RouteInfo(ipAddress, null, iface));
+ }
+ if (gateway != null) {
+ routes.add(new RouteInfo((LinkAddress) null, gateway, iface));
+ }
+ return routes;
+ }
+
+ /**
+ * Returns a LinkProperties object expressing the data in this object. Note that the information
+ * contained in the LinkProperties will not be a complete picture of the link's configuration,
+ * because any configuration information that is obtained dynamically by the network (e.g.,
+ * IPv6 configuration) will not be included.
+ */
+ public LinkProperties toLinkProperties(String iface) {
+ LinkProperties lp = new LinkProperties();
+ lp.setInterfaceName(iface);
+ if (ipAddress != null) {
+ lp.addLinkAddress(ipAddress);
+ }
+ for (RouteInfo route : getRoutes(iface)) {
+ lp.addRoute(route);
+ }
+ for (InetAddress dns : dnsServers) {
+ lp.addDnsServer(dns);
+ }
+ return lp;
+ }
+
+ public String toString() {
+ StringBuffer str = new StringBuffer();
+
+ str.append("IP address ");
+ if (ipAddress != null ) str.append(ipAddress).append(" ");
+
+ str.append("Gateway ");
+ if (gateway != null) str.append(gateway.getHostAddress()).append(" ");
+
+ str.append(" DNS servers: [");
+ for (InetAddress dnsServer : dnsServers) {
+ str.append(" ").append(dnsServer.getHostAddress());
+ }
+
+ str.append(" ] Domains");
+ if (domains != null) str.append(domains);
+ return str.toString();
+ }
+
+ public int hashCode() {
+ int result = 13;
+ result = 47 * result + (ipAddress == null ? 0 : ipAddress.hashCode());
+ result = 47 * result + (gateway == null ? 0 : gateway.hashCode());
+ result = 47 * result + (domains == null ? 0 : domains.hashCode());
+ result = 47 * result + dnsServers.hashCode();
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (!(obj instanceof StaticIpConfiguration)) return false;
+
+ StaticIpConfiguration other = (StaticIpConfiguration) obj;
+
+ return other != null &&
+ Objects.equals(ipAddress, other.ipAddress) &&
+ Objects.equals(gateway, other.gateway) &&
+ dnsServers.equals(other.dnsServers) &&
+ Objects.equals(domains, other.domains);
+ }
+
+ /** Implement the Parcelable interface */
+ public static Creator<StaticIpConfiguration> CREATOR =
+ new Creator<StaticIpConfiguration>() {
+ public StaticIpConfiguration createFromParcel(Parcel in) {
+ StaticIpConfiguration s = new StaticIpConfiguration();
+ readFromParcel(s, in);
+ return s;
+ }
+
+ public StaticIpConfiguration[] newArray(int size) {
+ return new StaticIpConfiguration[size];
+ }
+ };
+
+ /** Implement the Parcelable interface */
+ public int describeContents() {
+ return 0;
+ }
+
+ /** Implement the Parcelable interface */
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeParcelable(ipAddress, flags);
+ NetworkUtils.parcelInetAddress(dest, gateway, flags);
+ dest.writeInt(dnsServers.size());
+ for (InetAddress dnsServer : dnsServers) {
+ NetworkUtils.parcelInetAddress(dest, dnsServer, flags);
+ }
+ }
+
+ protected static void readFromParcel(StaticIpConfiguration s, Parcel in) {
+ s.ipAddress = in.readParcelable(null);
+ s.gateway = NetworkUtils.unparcelInetAddress(in);
+ s.dnsServers.clear();
+ int size = in.readInt();
+ for (int i = 0; i < size; i++) {
+ s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));
+ }
+ }
+}
diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl
index ee4d45e..5815fa6 100644
--- a/core/java/android/nfc/INfcAdapter.aidl
+++ b/core/java/android/nfc/INfcAdapter.aidl
@@ -59,5 +59,5 @@
void registerLockscreenDispatch(INfcLockscreenDispatch lockscreenDispatch, in int[] techList);
void addNfcUnlockHandler(INfcUnlockHandler unlockHandler, in int[] techList);
- void removeNfcUnlockHandler(IBinder b);
+ void removeNfcUnlockHandler(INfcUnlockHandler unlockHandler);
}
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index dde2cf1..6bd5a32 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -311,7 +311,7 @@
final NfcActivityManager mNfcActivityManager;
final Context mContext;
- final HashMap<NfcUnlockHandler, IBinder> mNfcUnlockHandlers;
+ final HashMap<NfcUnlockHandler, INfcUnlockHandler> mNfcUnlockHandlers;
final Object mLock;
/**
@@ -542,7 +542,7 @@
NfcAdapter(Context context) {
mContext = context;
mNfcActivityManager = new NfcActivityManager(this);
- mNfcUnlockHandlers = new HashMap<NfcUnlockHandler, IBinder>();
+ mNfcUnlockHandlers = new HashMap<NfcUnlockHandler, INfcUnlockHandler>();
mLock = new Object();
}
@@ -1498,27 +1498,37 @@
* <p /> The parameter {@code tagTechnologies} determines which Tag technologies will be polled for
* at the lockscreen. Polling for less tag technologies reduces latency, and so it is
* strongly recommended to only provide the Tag technologies that the handler is expected to
- * receive.
+ * receive. There must be at least one tag technology provided, otherwise the unlock handler
+ * is ignored.
*
* @hide
*/
@SystemApi
public boolean addNfcUnlockHandler(final NfcUnlockHandler unlockHandler,
String[] tagTechnologies) {
- try {
- INfcUnlockHandler.Stub iHandler = new INfcUnlockHandler.Stub() {
- @Override
- public boolean onUnlockAttempted(Tag tag) throws RemoteException {
- return unlockHandler.onUnlockAttempted(tag);
- }
- };
+ // If there are no tag technologies, don't bother adding unlock handler
+ if (tagTechnologies.length == 0) {
+ return false;
+ }
+ try {
synchronized (mLock) {
if (mNfcUnlockHandlers.containsKey(unlockHandler)) {
- return true;
+ // update the tag technologies
+ sService.removeNfcUnlockHandler(mNfcUnlockHandlers.get(unlockHandler));
+ mNfcUnlockHandlers.remove(unlockHandler);
}
- sService.addNfcUnlockHandler(iHandler, Tag.getTechCodesFromStrings(tagTechnologies));
- mNfcUnlockHandlers.put(unlockHandler, iHandler.asBinder());
+
+ INfcUnlockHandler.Stub iHandler = new INfcUnlockHandler.Stub() {
+ @Override
+ public boolean onUnlockAttempted(Tag tag) throws RemoteException {
+ return unlockHandler.onUnlockAttempted(tag);
+ }
+ };
+
+ sService.addNfcUnlockHandler(iHandler,
+ Tag.getTechCodesFromStrings(tagTechnologies));
+ mNfcUnlockHandlers.put(unlockHandler, iHandler);
}
} catch (RemoteException e) {
attemptDeadServiceRecovery(e);
@@ -1542,8 +1552,7 @@
try {
synchronized (mLock) {
if (mNfcUnlockHandlers.containsKey(unlockHandler)) {
- sService.removeNfcUnlockHandler(mNfcUnlockHandlers.get(unlockHandler));
- mNfcUnlockHandlers.remove(unlockHandler);
+ sService.removeNfcUnlockHandler(mNfcUnlockHandlers.remove(unlockHandler));
}
return true;
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 7d086e1..fe9f79b 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -1843,13 +1843,21 @@
}
pw.println();
}
-
+
+ /**
+ * Temporary for settings.
+ */
+ public final void dumpCheckinLocked(Context context, PrintWriter pw, int which, int reqUid) {
+ dumpCheckinLocked(context, pw, which, reqUid, BatteryStatsHelper.checkWifiOnly(context));
+ }
+
/**
* Checkin server version of dump to produce more compact, computer-readable log.
*
* NOTE: all times are expressed in 'ms'.
*/
- public final void dumpCheckinLocked(Context context, PrintWriter pw, int which, int reqUid) {
+ public final void dumpCheckinLocked(Context context, PrintWriter pw, int which, int reqUid,
+ boolean wifiOnly) {
final long rawUptime = SystemClock.uptimeMillis() * 1000;
final long rawRealtime = SystemClock.elapsedRealtime() * 1000;
final long batteryUptime = getBatteryUptime(rawUptime);
@@ -2046,7 +2054,7 @@
}
}
- BatteryStatsHelper helper = new BatteryStatsHelper(context, false);
+ BatteryStatsHelper helper = new BatteryStatsHelper(context, false, wifiOnly);
helper.create(this);
helper.refreshStats(which, UserHandle.USER_ALL);
List<BatterySipper> sippers = helper.getUsageList();
@@ -2315,9 +2323,17 @@
printer.print(BatteryStatsHelper.makemAh(power));
}
+ /**
+ * Temporary for settings.
+ */
+ public final void dumpLocked(Context context, PrintWriter pw, String prefix, int which,
+ int reqUid) {
+ dumpLocked(context, pw, prefix, which, reqUid, BatteryStatsHelper.checkWifiOnly(context));
+ }
+
@SuppressWarnings("unused")
public final void dumpLocked(Context context, PrintWriter pw, String prefix, final int which,
- int reqUid) {
+ int reqUid, boolean wifiOnly) {
final long rawUptime = SystemClock.uptimeMillis() * 1000;
final long rawRealtime = SystemClock.elapsedRealtime() * 1000;
final long batteryUptime = getBatteryUptime(rawUptime);
@@ -2746,7 +2762,7 @@
pw.println();
}
- BatteryStatsHelper helper = new BatteryStatsHelper(context, false);
+ BatteryStatsHelper helper = new BatteryStatsHelper(context, false, wifiOnly);
helper.create(this);
helper.refreshStats(which, UserHandle.USER_ALL);
List<BatterySipper> sippers = helper.getUsageList();
@@ -3049,7 +3065,7 @@
"partial", which, linePrefix);
linePrefix = printWakeLock(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), rawRealtime,
"window", which, linePrefix);
- if (!linePrefix.equals(": ")) {
+ if (true || !linePrefix.equals(": ")) {
sb.append(" realtime");
// Only print out wake locks that were held
pw.println(sb.toString());
@@ -3723,6 +3739,7 @@
public static final int DUMP_HISTORY_ONLY = 1<<2;
public static final int DUMP_INCLUDE_HISTORY = 1<<3;
public static final int DUMP_VERBOSE = 1<<4;
+ public static final int DUMP_DEVICE_WIFI_ONLY = 1<<5;
private void dumpHistoryLocked(PrintWriter pw, int flags, long histStart, boolean checkin) {
final HistoryPrinter hprinter = new HistoryPrinter();
@@ -3918,12 +3935,14 @@
pw.println("Statistics since last charge:");
pw.println(" System starts: " + getStartCount()
+ ", currently on battery: " + getIsOnBattery());
- dumpLocked(context, pw, "", STATS_SINCE_CHARGED, reqUid);
+ dumpLocked(context, pw, "", STATS_SINCE_CHARGED, reqUid,
+ (flags&DUMP_DEVICE_WIFI_ONLY) != 0);
pw.println();
}
if (!filtering || (flags&DUMP_UNPLUGGED_ONLY) != 0) {
pw.println("Statistics since last unplugged:");
- dumpLocked(context, pw, "", STATS_SINCE_UNPLUGGED, reqUid);
+ dumpLocked(context, pw, "", STATS_SINCE_UNPLUGGED, reqUid,
+ (flags&DUMP_DEVICE_WIFI_ONLY) != 0);
}
}
@@ -4013,10 +4032,12 @@
dumpLine(pw, 0 /* uid */, "i" /* category */, CHARGE_TIME_REMAIN_DATA,
(Object[])lineArgs);
}
- dumpCheckinLocked(context, pw, STATS_SINCE_CHARGED, -1);
+ dumpCheckinLocked(context, pw, STATS_SINCE_CHARGED, -1,
+ (flags&DUMP_DEVICE_WIFI_ONLY) != 0);
}
if (!filtering || (flags&DUMP_UNPLUGGED_ONLY) != 0) {
- dumpCheckinLocked(context, pw, STATS_SINCE_UNPLUGGED, -1);
+ dumpCheckinLocked(context, pw, STATS_SINCE_UNPLUGGED, -1,
+ (flags&DUMP_DEVICE_WIFI_ONLY) != 0);
}
}
}
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index a1c2aa1..645d510 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -614,7 +614,7 @@
* Flatten an ArrayMap into the parcel at the current dataPosition(),
* growing dataCapacity() if needed. The Map keys must be String objects.
*/
- /* package */ void writeArrayMapInternal(ArrayMap<String,Object> val) {
+ /* package */ void writeArrayMapInternal(ArrayMap<String, Object> val) {
if (val == null) {
writeInt(-1);
return;
@@ -629,7 +629,7 @@
int startPos;
for (int i=0; i<N; i++) {
if (DEBUG_ARRAY_MAP) startPos = dataPosition();
- writeValue(val.keyAt(i));
+ writeString(val.keyAt(i));
writeValue(val.valueAt(i));
if (DEBUG_ARRAY_MAP) Log.d(TAG, " Write #" + i + " "
+ (dataPosition()-startPos) + " bytes: key=0x"
@@ -639,6 +639,13 @@
}
/**
+ * @hide For testing only.
+ */
+ public void writeArrayMap(ArrayMap<String, Object> val) {
+ writeArrayMapInternal(val);
+ }
+
+ /**
* Flatten a Bundle into the parcel at the current dataPosition(),
* growing dataCapacity() if needed.
*/
@@ -2411,7 +2418,7 @@
int startPos;
while (N > 0) {
if (DEBUG_ARRAY_MAP) startPos = dataPosition();
- Object key = readValue(loader);
+ String key = readString();
Object value = readValue(loader);
if (DEBUG_ARRAY_MAP) Log.d(TAG, " Read #" + (N-1) + " "
+ (dataPosition()-startPos) + " bytes: key=0x"
@@ -2419,6 +2426,7 @@
outVal.append(key, value);
N--;
}
+ outVal.validate();
}
/* package */ void readArrayMapSafelyInternal(ArrayMap outVal, int N,
@@ -2429,7 +2437,7 @@
Log.d(TAG, "Reading safely " + N + " ArrayMap entries", here);
}
while (N > 0) {
- Object key = readValue(loader);
+ String key = readString();
if (DEBUG_ARRAY_MAP) Log.d(TAG, " Read safe #" + (N-1) + ": key=0x"
+ (key != null ? key.hashCode() : 0) + " " + key);
Object value = readValue(loader);
@@ -2438,6 +2446,17 @@
}
}
+ /**
+ * @hide For testing only.
+ */
+ public void readArrayMap(ArrayMap outVal, ClassLoader loader) {
+ final int N = readInt();
+ if (N < 0) {
+ return;
+ }
+ readArrayMapInternal(outVal, N, loader);
+ }
+
private void readListInternal(List outVal, int N,
ClassLoader loader) {
while (N > 0) {
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 6334f76..75f8279 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -298,10 +298,10 @@
public static final int USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS = 1 << 0;
/**
- * Go to sleep reason code: Going to sleep due by user request.
+ * Go to sleep reason code: Going to sleep due by application request.
* @hide
*/
- public static final int GO_TO_SLEEP_REASON_USER = 0;
+ public static final int GO_TO_SLEEP_REASON_APPLICATION = 0;
/**
* Go to sleep reason code: Going to sleep due by request of the
@@ -317,6 +317,24 @@
public static final int GO_TO_SLEEP_REASON_TIMEOUT = 2;
/**
+ * Go to sleep reason code: Going to sleep due to the lid switch being closed.
+ * @hide
+ */
+ public static final int GO_TO_SLEEP_REASON_LID_SWITCH = 3;
+
+ /**
+ * Go to sleep reason code: Going to sleep due to the power button being pressed.
+ * @hide
+ */
+ public static final int GO_TO_SLEEP_REASON_POWER_BUTTON = 4;
+
+ /**
+ * Go to sleep reason code: Going to sleep due to HDMI.
+ * @hide
+ */
+ public static final int GO_TO_SLEEP_REASON_HDMI = 5;
+
+ /**
* The value to pass as the 'reason' argument to reboot() to
* reboot into recovery mode (for applying system updates, doing
* factory resets, etc.).
@@ -325,6 +343,7 @@
* permission (in addition to
* {@link android.Manifest.permission#REBOOT}).
* </p>
+ * @hide
*/
public static final String REBOOT_RECOVERY = "recovery";
@@ -513,7 +532,7 @@
* @see #wakeUp
*/
public void goToSleep(long time) {
- goToSleep(time, GO_TO_SLEEP_REASON_USER, 0);
+ goToSleep(time, GO_TO_SLEEP_REASON_APPLICATION, 0);
}
/**
@@ -754,6 +773,7 @@
private boolean mHeld;
private WorkSource mWorkSource;
private String mHistoryTag;
+ private final String mTraceName;
private final Runnable mReleaser = new Runnable() {
public void run() {
@@ -766,6 +786,7 @@
mTag = tag;
mPackageName = packageName;
mToken = new Binder();
+ mTraceName = "WakeLock (" + mTag + ")";
}
@Override
@@ -773,6 +794,7 @@
synchronized (mToken) {
if (mHeld) {
Log.wtf(TAG, "WakeLock finalized while still held: " + mTag);
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, mTraceName, 0);
try {
mService.releaseWakeLock(mToken, 0);
} catch (RemoteException e) {
@@ -839,6 +861,7 @@
// should immediately acquire the wake lock once again despite never having
// been explicitly released by the keyguard.
mHandler.removeCallbacks(mReleaser);
+ Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, mTraceName, 0);
try {
mService.acquireWakeLock(mToken, mFlags, mTag, mPackageName, mWorkSource,
mHistoryTag);
@@ -878,6 +901,7 @@
if (!mRefCounted || --mCount == 0) {
mHandler.removeCallbacks(mReleaser);
if (mHeld) {
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, mTraceName, 0);
try {
mService.releaseWakeLock(mToken, flags);
} catch (RemoteException e) {
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 7aee455..7a46e40 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -432,7 +432,7 @@
// Having written the command file, go ahead and reboot
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
- pm.reboot("recovery");
+ pm.reboot(PowerManager.REBOOT_RECOVERY);
throw new IOException("Reboot failed (no permissions?)");
}
diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index 474192fd..31b5849 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -36,6 +36,7 @@
private static final String TAG = "Trace";
// These tags must be kept in sync with system/core/include/cutils/trace.h.
+ // They should also be added to frameworks/native/cmds/atrace/atrace.cpp.
/** @hide */
public static final long TRACE_TAG_NEVER = 0;
/** @hide */
@@ -72,6 +73,8 @@
public static final long TRACE_TAG_RS = 1L << 15;
/** @hide */
public static final long TRACE_TAG_BIONIC = 1L << 16;
+ /** @hide */
+ public static final long TRACE_TAG_POWER = 1L << 17;
private static final long TRACE_TAG_NOT_READY = 1L << 63;
private static final int MAX_SECTION_NAME_LEN = 127;
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 3087506..e215669 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -57,8 +57,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from changing Wi-Fi
- * access points.
- * The default value is <code>false</code>.
+ * access points. The default value is <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -119,7 +118,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from transferring files over
- * USB. The default value is <code>false</code>.
+ * USB. This can only be set by device owners. The default value is <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -139,8 +138,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from removing itself and other
- * users.
- * The default value is <code>false</code>.
+ * users. The default value is <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -170,7 +168,8 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from configuring Tethering
- * & portable hotspots. The default value is <code>false</code>.
+ * & portable hotspots. This can only be set by device owners. The default value is
+ * <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -180,8 +179,8 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from factory resetting
- * from Settings.
- * The default value is <code>false</code>.
+ * from Settings. This can only be set by device owners. The default value is
+ * <code>false</code>.
* <p>
* @see #setUserRestrictions(Bundle)
* @see #getUserRestrictions()
@@ -190,7 +189,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from adding new users and
- * profiles. The default value is <code>false</code>.
+ * profiles. This can only be set by device owners. The default value is <code>false</code>.
* <p>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -210,7 +209,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from configuring cell
- * broadcasts. The default value is <code>false</code>.
+ * broadcasts. This can only be set by device owners. The default value is <code>false</code>.
* <p>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -220,7 +219,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from configuring mobile
- * networks. The default value is <code>false</code>.
+ * networks. This can only be set by device owners. The default value is <code>false</code>.
* <p>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -249,7 +248,8 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from mounting
- * physical external media. The default value is <code>false</code>.
+ * physical external media. This can only be set by device owners. The default value is
+ * <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -259,7 +259,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from adjusting microphone
- * volume.
+ * volume. If set, the microphone will be muted. This can only be set by device owners.
* The default value is <code>false</code>.
* <p/>
* Type: Boolean
@@ -270,7 +270,7 @@
/**
* Key for user restrictions. Specifies if a user is disallowed from adjusting the master
- * volume.
+ * volume. If set, the master volume will be muted. This can only be set by device owners.
* The default value is <code>false</code>.
* <p/>
* Type: Boolean
@@ -292,8 +292,7 @@
/**
* Key for user restrictions. Specifies that the user is not allowed to send or receive
- * SMS messages.
- * The default value is <code>false</code>.
+ * SMS messages. This can only be set by device owners. The default value is <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -311,7 +310,7 @@
* <li>{@link LayoutParams#TYPE_SYSTEM_ERROR}</li>
* <li>{@link LayoutParams#TYPE_SYSTEM_OVERLAY}</li>
*
- * <p>The default value is <code>false</code>.
+ * <p>This can only be set by device owners. The default value is <code>false</code>.
* <p/>
* Type: Boolean
* @see #setUserRestrictions(Bundle)
@@ -499,7 +498,12 @@
* Sets all the user-wide restrictions for this user.
* Requires the MANAGE_USERS permission.
* @param restrictions the Bundle containing all the restrictions.
+ * @deprecated use {@link android.app.admin.DevicePolicyManager#addUserRestriction(
+ * android.content.ComponentName, String)} or
+ * {@link android.app.admin.DevicePolicyManager#clearUserRestriction(
+ * android.content.ComponentName, String)} instead.
*/
+ @Deprecated
public void setUserRestrictions(Bundle restrictions) {
setUserRestrictions(restrictions, Process.myUserHandle());
}
@@ -509,7 +513,12 @@
* Requires the MANAGE_USERS permission.
* @param restrictions the Bundle containing all the restrictions.
* @param userHandle the UserHandle of the user for whom to set the restrictions.
+ * @deprecated use {@link android.app.admin.DevicePolicyManager#addUserRestriction(
+ * android.content.ComponentName, String)} or
+ * {@link android.app.admin.DevicePolicyManager#clearUserRestriction(
+ * android.content.ComponentName, String)} instead.
*/
+ @Deprecated
public void setUserRestrictions(Bundle restrictions, UserHandle userHandle) {
try {
mService.setUserRestrictions(restrictions, userHandle.getIdentifier());
@@ -523,7 +532,12 @@
* Requires the MANAGE_USERS permission.
* @param key the key of the restriction
* @param value the value for the restriction
+ * @deprecated use {@link android.app.admin.DevicePolicyManager#addUserRestriction(
+ * android.content.ComponentName, String)} or
+ * {@link android.app.admin.DevicePolicyManager#clearUserRestriction(
+ * android.content.ComponentName, String)} instead.
*/
+ @Deprecated
public void setUserRestriction(String key, boolean value) {
Bundle bundle = getUserRestrictions();
bundle.putBoolean(key, value);
@@ -537,7 +551,12 @@
* @param key the key of the restriction
* @param value the value for the restriction
* @param userHandle the user whose restriction is to be changed.
+ * @deprecated use {@link android.app.admin.DevicePolicyManager#addUserRestriction(
+ * android.content.ComponentName, String)} or
+ * {@link android.app.admin.DevicePolicyManager#clearUserRestriction(
+ * android.content.ComponentName, String)} instead.
*/
+ @Deprecated
public void setUserRestriction(String key, boolean value, UserHandle userHandle) {
Bundle bundle = getUserRestrictions(userHandle);
bundle.putBoolean(key, value);
@@ -696,9 +715,29 @@
}
/**
+ * Checks whether it's possible to add more users. Caller must hold the MANAGE_USERS
+ * permission.
+ *
+ * @return true if more users can be added, false if limit has been reached.
+ * @hide
+ */
+ public boolean canAddMoreUsers() {
+ final List<UserInfo> users = getUsers(true);
+ final int totalUserCount = users.size();
+ int aliveUserCount = 0;
+ for (int i = 0; i < totalUserCount; i++) {
+ UserInfo user = users.get(i);
+ if (!user.isGuest()) {
+ aliveUserCount++;
+ }
+ }
+ return aliveUserCount < getMaxSupportedUsers();
+ }
+
+ /**
* Returns list of the profiles of userHandle including
* userHandle itself.
- * Note that it this returns both enabled and not enabled profiles. See
+ * Note that this returns both enabled and not enabled profiles. See
* {@link #getUserProfiles()} if you need only the enabled ones.
*
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
@@ -933,7 +972,7 @@
if (badgeLocation != null) {
if (badgeLocation.left < 0 || badgeLocation.top < 0
- || badgeLocation.right > badgedWidth || badgeLocation.bottom > badgedHeight) {
+ || badgeLocation.width() > badgedWidth || badgeLocation.height() > badgedHeight) {
throw new IllegalArgumentException("Badge location " + badgeLocation
+ " not in badged drawable bounds "
+ new Rect(0, 0, badgedWidth, badgedHeight));
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 68b91cb..4cdafe1 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -619,6 +619,16 @@
private static final long DEFAULT_FULL_THRESHOLD_BYTES = MB_IN_BYTES;
/**
+ * Return the number of available bytes until the given path is considered
+ * running low on storage.
+ *
+ * @hide
+ */
+ public long getStorageBytesUntilLow(File path) {
+ return path.getUsableSpace() - getStorageFullBytes(path);
+ }
+
+ /**
* Return the number of available bytes at which the given path is
* considered running low on storage.
*
diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index acd7942..e95e6e2 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -258,6 +258,7 @@
*/
public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
if (mPreferenceManager.setPreferences(preferenceScreen) && preferenceScreen != null) {
+ onUnbindPreferences();
mHavePrefs = true;
if (mInitDone) {
postBindPreferences();
@@ -350,6 +351,10 @@
}
/** @hide */
+ protected void onUnbindPreferences() {
+ }
+
+ /** @hide */
public ListView getListView() {
ensureList();
return mList;
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 55ba9e9..52f1dd9 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -170,6 +170,20 @@
"android.settings.ACCESSIBILITY_SETTINGS";
/**
+ * Activity Action: Show settings to control access to usage information.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_USAGE_ACCESS_SETTINGS =
+ "android.settings.USAGE_ACCESS_SETTINGS";
+
+ /**
* Activity Action: Show settings to allow configuration of security and
* location privacy.
* <p>
@@ -291,7 +305,7 @@
/**
* Activity Action: Show settings to allow configuration of
- * {@link android.media.routing.MediaRouteService media route providers}.
+ * cast endpoints.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
* safeguard against this.
@@ -372,6 +386,21 @@
* Output: Nothing.
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_VOICE_INPUT_SETTINGS =
+ "android.settings.VOICE_INPUT_SETTINGS";
+
+ /**
+ * Activity Action: Show settings to configure input methods, in particular
+ * allowing the user to enable input methods.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_INPUT_METHOD_SETTINGS =
"android.settings.INPUT_METHOD_SETTINGS";
@@ -2302,7 +2331,7 @@
* preference, this rotation value will be used. Must be one of the
* {@link android.view.Surface#ROTATION_0 Surface rotation constants}.
*
- * @see Display#getRotation
+ * @see android.view.Display#getRotation
*/
public static final String USER_ROTATION = "user_rotation";
@@ -2335,16 +2364,6 @@
public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
/**
- * Whether automatic routing of system audio to USB audio peripheral is disabled.
- * The value is boolean (1 or 0), where 1 means automatic routing is disabled,
- * and 0 means automatic routing is enabled.
- *
- * @hide
- */
- public static final String USB_AUDIO_AUTOMATIC_ROUTING_DISABLED =
- "usb_audio_automatic_routing_disabled";
-
- /**
* Whether the audible DTMF tones are played by the dialer when dialing. The value is
* boolean (1 or 0).
*/
@@ -2420,7 +2439,8 @@
public static final String SHOW_TOUCHES = "show_touches";
/**
- * Log raw orientation data from {@link WindowOrientationListener} for use with the
+ * Log raw orientation data from
+ * {@link com.android.internal.policy.impl.WindowOrientationListener} for use with the
* orientationplot.py tool.
* 0 = no
* 1 = yes
@@ -2648,6 +2668,16 @@
};
/**
+ * These entries are considered common between the personal and the managed profile,
+ * since the managed profile doesn't get to change them.
+ * @hide
+ */
+ public static final String[] CLONE_TO_MANAGED_PROFILE = {
+ DATE_FORMAT,
+ TIME_12_24
+ };
+
+ /**
* When to use Wi-Fi calling
*
* @see android.telephony.TelephonyManager.WifiCallingChoices
@@ -3516,6 +3546,13 @@
public static final String DISABLED_SYSTEM_INPUT_METHODS = "disabled_system_input_methods";
/**
+ * Whether to show the IME when a hard keyboard is connected. This is a boolean that
+ * determines if the IME should be shown when a hard keyboard is attached.
+ * @hide
+ */
+ public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";
+
+ /**
* Host name and port for global http proxy. Uses ':' seperator for
* between host and port.
*
@@ -4716,6 +4753,16 @@
public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels";
/**
+ * Whether automatic routing of system audio to USB audio peripheral is disabled.
+ * The value is boolean (1 or 0), where 1 means automatic routing is disabled,
+ * and 0 means automatic routing is enabled.
+ *
+ * @hide
+ */
+ public static final String USB_AUDIO_AUTOMATIC_ROUTING_DISABLED =
+ "usb_audio_automatic_routing_disabled";
+
+ /**
* This are the settings to be backed up.
*
* NOTE: Settings are backed up and restored in the order they appear
@@ -4768,6 +4815,26 @@
};
/**
+ * These entries are considered common between the personal and the managed profile,
+ * since the managed profile doesn't get to change them.
+ * @hide
+ */
+ public static final String[] CLONE_TO_MANAGED_PROFILE = {
+ ACCESSIBILITY_ENABLED,
+ ALLOW_MOCK_LOCATION,
+ ALLOWED_GEOLOCATION_ORIGINS,
+ DEFAULT_INPUT_METHOD,
+ ENABLED_ACCESSIBILITY_SERVICES,
+ ENABLED_INPUT_METHODS,
+ LOCATION_MODE,
+ LOCATION_PROVIDERS_ALLOWED,
+ LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+ SELECTED_INPUT_METHOD_SUBTYPE,
+ SELECTED_SPELL_CHECKER,
+ SELECTED_SPELL_CHECKER_SUBTYPE
+ };
+
+ /**
* Helper method for determining if a location provider is enabled.
*
* @param cr the content resolver to use
@@ -5072,6 +5139,13 @@
public static final String UNLOCK_SOUND = "unlock_sound";
/**
+ * URI for the "device is trusted" sound, which is played when the device enters the trusted
+ * state without unlocking.
+ * @hide
+ */
+ public static final String TRUSTED_SOUND = "trusted_sound";
+
+ /**
* URI for the low battery sound file.
* @hide
*/
@@ -5116,6 +5190,12 @@
public static final String ADB_ENABLED = "adb_enabled";
/**
+ * Whether Views are allowed to save their attribute data.
+ * @hide
+ */
+ public static final String DEBUG_VIEW_ATTRIBUTES = "debug_view_attributes";
+
+ /**
* Whether assisted GPS should be enabled or not.
* @hide
*/
@@ -6343,7 +6423,7 @@
/**
* Milliseconds to wait before bouncing Wi-Fi after settings is restored. Note that after
- * the caller is done with this, they should call {@link ContentResolver#delete(Uri)} to
+ * the caller is done with this, they should call {@link ContentResolver#delete} to
* clean up any value that they may have written.
*
* @hide
@@ -6411,6 +6491,14 @@
public static final String GUEST_USER_ENABLED = "guest_user_enabled";
/**
+ * Whether the NetworkScoringService has been first initialized.
+ * <p>
+ * Type: int (0 for false, 1 for true)
+ * @hide
+ */
+ public static final String NETWORK_SCORING_PROVISIONED = "network_scoring_provisioned";
+
+ /**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
*
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index cc09653..872f911 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -73,9 +73,14 @@
private static final String CONDITION_TAG = "condition";
private static final String CONDITION_ATT_COMPONENT = "component";
private static final String CONDITION_ATT_ID = "id";
+ private static final String CONDITION_ATT_SUMMARY = "summary";
+ private static final String CONDITION_ATT_LINE1 = "line1";
+ private static final String CONDITION_ATT_LINE2 = "line2";
+ private static final String CONDITION_ATT_ICON = "icon";
+ private static final String CONDITION_ATT_STATE = "state";
+ private static final String CONDITION_ATT_FLAGS = "flags";
private static final String EXIT_CONDITION_TAG = "exitCondition";
- private static final String EXIT_CONDITION_ATT_ID = "id";
private static final String EXIT_CONDITION_ATT_COMPONENT = "component";
public boolean allowCalls;
@@ -83,13 +88,13 @@
public int allowFrom = SOURCE_ANYONE;
public String sleepMode;
- public int sleepStartHour;
- public int sleepStartMinute;
+ public int sleepStartHour; // 0-23
+ public int sleepStartMinute; // 0-59
public int sleepEndHour;
public int sleepEndMinute;
public ComponentName[] conditionComponents;
public Uri[] conditionIds;
- public Uri exitConditionId;
+ public Condition exitCondition;
public ComponentName exitConditionComponent;
public ZenModeConfig() { }
@@ -115,7 +120,7 @@
source.readTypedArray(conditionIds, Uri.CREATOR);
}
allowFrom = source.readInt();
- exitConditionId = source.readParcelable(null);
+ exitCondition = source.readParcelable(null);
exitConditionComponent = source.readParcelable(null);
}
@@ -146,7 +151,7 @@
dest.writeInt(0);
}
dest.writeInt(allowFrom);
- dest.writeParcelable(exitConditionId, 0);
+ dest.writeParcelable(exitCondition, 0);
dest.writeParcelable(exitConditionComponent, 0);
}
@@ -163,7 +168,7 @@
.append(conditionComponents == null ? null : TextUtils.join(",", conditionComponents))
.append(",conditionIds=")
.append(conditionIds == null ? null : TextUtils.join(",", conditionIds))
- .append(",exitConditionId=").append(exitConditionId)
+ .append(",exitCondition=").append(exitCondition)
.append(",exitConditionComponent=").append(exitConditionComponent)
.append(']').toString();
}
@@ -196,7 +201,7 @@
&& other.sleepEndMinute == sleepEndMinute
&& Objects.deepEquals(other.conditionComponents, conditionComponents)
&& Objects.deepEquals(other.conditionIds, conditionIds)
- && Objects.equals(other.exitConditionId, exitConditionId)
+ && Objects.equals(other.exitCondition, exitCondition)
&& Objects.equals(other.exitConditionComponent, exitConditionComponent);
}
@@ -205,7 +210,7 @@
return Objects.hash(allowCalls, allowMessages, allowFrom, sleepMode,
sleepStartHour, sleepStartMinute, sleepEndHour, sleepEndMinute,
Arrays.hashCode(conditionComponents), Arrays.hashCode(conditionIds),
- exitConditionId, exitConditionComponent);
+ exitCondition, exitConditionComponent);
}
public boolean isValid() {
@@ -294,9 +299,11 @@
conditionIds.add(conditionId);
}
} else if (EXIT_CONDITION_TAG.equals(tag)) {
- rt.exitConditionId = safeUri(parser, EXIT_CONDITION_ATT_ID);
- rt.exitConditionComponent =
- safeComponentName(parser, EXIT_CONDITION_ATT_COMPONENT);
+ rt.exitCondition = readConditionXml(parser);
+ if (rt.exitCondition != null) {
+ rt.exitConditionComponent =
+ safeComponentName(parser, EXIT_CONDITION_ATT_COMPONENT);
+ }
}
}
}
@@ -333,16 +340,42 @@
out.endTag(null, CONDITION_TAG);
}
}
- if (exitConditionId != null && exitConditionComponent != null) {
+ if (exitCondition != null && exitConditionComponent != null) {
out.startTag(null, EXIT_CONDITION_TAG);
- out.attribute(null, EXIT_CONDITION_ATT_ID, exitConditionId.toString());
out.attribute(null, EXIT_CONDITION_ATT_COMPONENT,
exitConditionComponent.flattenToString());
+ writeConditionXml(exitCondition, out);
out.endTag(null, EXIT_CONDITION_TAG);
}
out.endTag(null, ZEN_TAG);
}
+ public static Condition readConditionXml(XmlPullParser parser) {
+ final Uri id = safeUri(parser, CONDITION_ATT_ID);
+ final String summary = parser.getAttributeValue(null, CONDITION_ATT_SUMMARY);
+ final String line1 = parser.getAttributeValue(null, CONDITION_ATT_LINE1);
+ final String line2 = parser.getAttributeValue(null, CONDITION_ATT_LINE2);
+ final int icon = safeInt(parser, CONDITION_ATT_ICON, -1);
+ final int state = safeInt(parser, CONDITION_ATT_STATE, -1);
+ final int flags = safeInt(parser, CONDITION_ATT_FLAGS, -1);
+ try {
+ return new Condition(id, summary, line1, line2, icon, state, flags);
+ } catch (IllegalArgumentException e) {
+ Slog.w(TAG, "Unable to read condition xml", e);
+ return null;
+ }
+ }
+
+ public static void writeConditionXml(Condition c, XmlSerializer out) throws IOException {
+ out.attribute(null, CONDITION_ATT_ID, c.id.toString());
+ out.attribute(null, CONDITION_ATT_SUMMARY, c.summary);
+ out.attribute(null, CONDITION_ATT_LINE1, c.line1);
+ out.attribute(null, CONDITION_ATT_LINE2, c.line2);
+ out.attribute(null, CONDITION_ATT_ICON, Integer.toString(c.icon));
+ out.attribute(null, CONDITION_ATT_STATE, Integer.toString(c.state));
+ out.attribute(null, CONDITION_ATT_FLAGS, Integer.toString(c.flags));
+ }
+
public static boolean isValidHour(int val) {
return val >= 0 && val < 24;
}
@@ -403,21 +436,31 @@
}
};
- // Built-in countdown conditions, e.g. condition://android/countdown/1399917958951
+ public DowntimeInfo toDowntimeInfo() {
+ final DowntimeInfo downtime = new DowntimeInfo();
+ downtime.startHour = sleepStartHour;
+ downtime.startMinute = sleepStartMinute;
+ downtime.endHour = sleepEndHour;
+ downtime.endMinute = sleepEndMinute;
+ return downtime;
+ }
- private static final String COUNTDOWN_AUTHORITY = "android";
+ // For built-in conditions
+ private static final String SYSTEM_AUTHORITY = "android";
+
+ // Built-in countdown conditions, e.g. condition://android/countdown/1399917958951
private static final String COUNTDOWN_PATH = "countdown";
public static Uri toCountdownConditionId(long time) {
return new Uri.Builder().scheme(Condition.SCHEME)
- .authority(COUNTDOWN_AUTHORITY)
+ .authority(SYSTEM_AUTHORITY)
.appendPath(COUNTDOWN_PATH)
.appendPath(Long.toString(time))
.build();
}
public static long tryParseCountdownConditionId(Uri conditionId) {
- if (!Condition.isValidId(conditionId, COUNTDOWN_AUTHORITY)) return 0;
+ if (!Condition.isValidId(conditionId, SYSTEM_AUTHORITY)) return 0;
if (conditionId.getPathSegments().size() != 2
|| !COUNTDOWN_PATH.equals(conditionId.getPathSegments().get(0))) return 0;
try {
@@ -431,4 +474,68 @@
public static boolean isValidCountdownConditionId(Uri conditionId) {
return tryParseCountdownConditionId(conditionId) != 0;
}
+
+ // Built-in downtime conditions, e.g. condition://android/downtime?start=10.00&end=7.00
+ private static final String DOWNTIME_PATH = "downtime";
+
+ public static Uri toDowntimeConditionId(DowntimeInfo downtime) {
+ return new Uri.Builder().scheme(Condition.SCHEME)
+ .authority(SYSTEM_AUTHORITY)
+ .appendPath(DOWNTIME_PATH)
+ .appendQueryParameter("start", downtime.startHour + "." + downtime.startMinute)
+ .appendQueryParameter("end", downtime.endHour + "." + downtime.endMinute)
+ .build();
+ }
+
+ public static DowntimeInfo tryParseDowntimeConditionId(Uri conditionId) {
+ if (!Condition.isValidId(conditionId, SYSTEM_AUTHORITY)
+ || conditionId.getPathSegments().size() != 1
+ || !DOWNTIME_PATH.equals(conditionId.getPathSegments().get(0))) {
+ return null;
+ }
+ final int[] start = tryParseHourAndMinute(conditionId.getQueryParameter("start"));
+ final int[] end = tryParseHourAndMinute(conditionId.getQueryParameter("end"));
+ if (start == null || end == null) return null;
+ final DowntimeInfo downtime = new DowntimeInfo();
+ downtime.startHour = start[0];
+ downtime.startMinute = start[1];
+ downtime.endHour = end[0];
+ downtime.endMinute = end[1];
+ return downtime;
+ }
+
+ private static int[] tryParseHourAndMinute(String value) {
+ if (TextUtils.isEmpty(value)) return null;
+ final int i = value.indexOf('.');
+ if (i < 1 || i >= value.length() - 1) return null;
+ final int hour = tryParseInt(value.substring(0, i), -1);
+ final int minute = tryParseInt(value.substring(i + 1), -1);
+ return isValidHour(hour) && isValidMinute(minute) ? new int[] { hour, minute } : null;
+ }
+
+ public static boolean isValidDowntimeConditionId(Uri conditionId) {
+ return tryParseDowntimeConditionId(conditionId) != null;
+ }
+
+ public static class DowntimeInfo {
+ public int startHour; // 0-23
+ public int startMinute; // 0-59
+ public int endHour;
+ public int endMinute;
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof DowntimeInfo)) return false;
+ final DowntimeInfo other = (DowntimeInfo) o;
+ return startHour == other.startHour
+ && startMinute == other.startMinute
+ && endHour == other.endHour
+ && endMinute == other.endMinute;
+ }
+ }
}
diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java
index 42a2e57..0ffdf68 100644
--- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java
+++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java
@@ -16,6 +16,7 @@
package android.service.persistentdata;
+import android.annotation.SystemApi;
import android.os.RemoteException;
import android.util.Slog;
@@ -30,12 +31,14 @@
* {@link PersistentDataBlockManager#getDataBlockSize()}.
*
* Clients can query the maximum size for a block via
+ * {@link PersistentDataBlockManager#getMaximumDataBlockSize()}
*
* Clients can read the currently written block by invoking
* {@link PersistentDataBlockManager#read()}.
*
* @hide
*/
+@SystemApi
public class PersistentDataBlockManager {
private static final String TAG = PersistentDataBlockManager.class.getSimpleName();
private IPersistentDataBlockService sService;
diff --git a/core/java/android/service/restrictions/RestrictionsReceiver.java b/core/java/android/service/restrictions/RestrictionsReceiver.java
new file mode 100644
index 0000000..7c6e1f6
--- /dev/null
+++ b/core/java/android/service/restrictions/RestrictionsReceiver.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.restrictions;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.RestrictionsManager;
+import android.os.IBinder;
+import android.os.PersistableBundle;
+
+/**
+ * Abstract implementation of a Restrictions Provider BroadcastReceiver. To implement a
+ * Restrictions Provider, extend from this class and implement the abstract methods.
+ * Export this receiver in the manifest. A profile owner device admin can then register this
+ * component as a Restrictions Provider using
+ * {@link DevicePolicyManager#setRestrictionsProvider(ComponentName, ComponentName)}.
+ * <p>
+ * The function of a Restrictions Provider is to transport permission requests from apps on this
+ * device to an administrator (most likely on a remote device or computer) and deliver back
+ * responses. The response should be sent back to the app via
+ * {@link RestrictionsManager#notifyPermissionResponse(String, PersistableBundle)}.
+ *
+ * @see RestrictionsManager
+ */
+public abstract class RestrictionsReceiver extends BroadcastReceiver {
+
+ private static final String TAG = "RestrictionsReceiver";
+
+ /**
+ * An asynchronous permission request made by an application for an operation that requires
+ * authorization by a local or remote administrator other than the user. The Restrictions
+ * Provider should transfer the request to the administrator and deliver back a response, when
+ * available. The calling application is aware that the response could take an indefinite
+ * amount of time.
+ * <p>
+ * If the request bundle contains the key {@link RestrictionsManager#REQUEST_KEY_NEW_REQUEST},
+ * then a new request must be sent. Otherwise the provider can look up any previous response
+ * to the same requestId and return the cached response.
+ *
+ * @param packageName the application requesting permission.
+ * @param requestType the type of request, which determines the content and presentation of
+ * the request data.
+ * @param request the request data bundle containing at a minimum a request id.
+ *
+ * @see RestrictionsManager#REQUEST_TYPE_APPROVAL
+ * @see RestrictionsManager#REQUEST_TYPE_LOCAL_APPROVAL
+ * @see RestrictionsManager#REQUEST_KEY_ID
+ */
+ public abstract void onRequestPermission(Context context,
+ String packageName, String requestType, String requestId, PersistableBundle request);
+
+ /**
+ * Intercept standard Restrictions Provider broadcasts. Implementations
+ * should not override this method; it is better to implement the
+ * convenience callbacks for each action.
+ */
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+
+ if (RestrictionsManager.ACTION_REQUEST_PERMISSION.equals(action)) {
+ String packageName = intent.getStringExtra(RestrictionsManager.EXTRA_PACKAGE_NAME);
+ String requestType = intent.getStringExtra(RestrictionsManager.EXTRA_REQUEST_TYPE);
+ String requestId = intent.getStringExtra(RestrictionsManager.EXTRA_REQUEST_ID);
+ PersistableBundle request = (PersistableBundle)
+ intent.getParcelableExtra(RestrictionsManager.EXTRA_REQUEST_BUNDLE);
+ onRequestPermission(context, packageName, requestType, requestId, request);
+ }
+ }
+}
diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java
index 51f07ec..5fe9194 100644
--- a/core/java/android/service/trust/TrustAgentService.java
+++ b/core/java/android/service/trust/TrustAgentService.java
@@ -69,12 +69,6 @@
"[" + getClass().getSimpleName() + "]";
private static final boolean DEBUG = false;
- // Temporary workaround to allow current trust agent implementations to continue working.
- // This and the code guarded by this should be removed before shipping.
- // If true, calls setManagingTrust(true) after onCreate, if it wasn't already set.
- // TODO: Remove this once all agents are updated.
- private static final boolean SET_MANAGED_FOR_LEGACY_AGENTS = true;
-
/**
* The {@link Intent} that must be declared as handled by the service.
*/
@@ -130,11 +124,6 @@
@Override
public void onCreate() {
- // TODO: Remove this once all agents are updated.
- if (SET_MANAGED_FOR_LEGACY_AGENTS) {
- setManagingTrust(true);
- }
-
super.onCreate();
ComponentName component = new ComponentName(this, getClass());
try {
@@ -175,7 +164,7 @@
* set.
*
* @param options Option feature bundle.
- * @return true if the {@link #TrustAgentService()} supports this feature.
+ * @return true if the {@link TrustAgentService} supports this feature.
*/
public boolean onSetTrustAgentFeaturesEnabled(Bundle options) {
return false;
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
index bacda04..e6e9413 100644
--- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java
+++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
@@ -99,6 +99,11 @@
mParseError = "No sessionService specified";
return;
}
+ /* Not yet time
+ if (mRecognitionService == null) {
+ mParseError = "No recogitionService specified";
+ return;
+ } */
} catch (XmlPullParserException e) {
mParseError = "Error parsing voice interation service meta-data: " + e;
Log.w(TAG, "error parsing voice interaction service meta-data", e);
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index a36f06c7..7dce348 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -273,16 +273,22 @@
// Draw all leading margin spans. Adjust left or right according
// to the paragraph direction of the line.
final int length = spans.length;
+ boolean useFirstLineMargin = isFirstParaLine;
+ for (int n = 0; n < length; n++) {
+ if (spans[n] instanceof LeadingMarginSpan2) {
+ int count = ((LeadingMarginSpan2) spans[n]).getLeadingMarginLineCount();
+ int startLine = getLineForOffset(sp.getSpanStart(spans[n]));
+ // if there is more than one LeadingMarginSpan2, use
+ // the count that is greatest
+ if (i < startLine + count) {
+ useFirstLineMargin = true;
+ break;
+ }
+ }
+ }
for (int n = 0; n < length; n++) {
if (spans[n] instanceof LeadingMarginSpan) {
LeadingMarginSpan margin = (LeadingMarginSpan) spans[n];
- boolean useFirstLineMargin = isFirstParaLine;
- if (margin instanceof LeadingMarginSpan2) {
- int count = ((LeadingMarginSpan2) margin).getLeadingMarginLineCount();
- int startLine = getLineForOffset(sp.getSpanStart(margin));
- useFirstLineMargin = i < startLine + count;
- }
-
if (dir == DIR_RIGHT_TO_LEFT) {
margin.drawLeadingMargin(canvas, paint, right, dir, ltop,
lbaseline, lbottom, buf,
@@ -1535,15 +1541,18 @@
boolean isFirstParaLine = lineStart == 0 ||
spanned.charAt(lineStart - 1) == '\n';
+ boolean useFirstLineMargin = isFirstParaLine;
+ for (int i = 0; i < spans.length; i++) {
+ if (spans[i] instanceof LeadingMarginSpan2) {
+ int spStart = spanned.getSpanStart(spans[i]);
+ int spanLine = getLineForOffset(spStart);
+ int count = ((LeadingMarginSpan2) spans[i]).getLeadingMarginLineCount();
+ // if there is more than one LeadingMarginSpan2, use the count that is greatest
+ useFirstLineMargin |= line < spanLine + count;
+ }
+ }
for (int i = 0; i < spans.length; i++) {
LeadingMarginSpan span = spans[i];
- boolean useFirstLineMargin = isFirstParaLine;
- if (span instanceof LeadingMarginSpan2) {
- int spStart = spanned.getSpanStart(span);
- int spanLine = getLineForOffset(spStart);
- int count = ((LeadingMarginSpan2)span).getLeadingMarginLineCount();
- useFirstLineMargin = line < spanLine + count;
- }
margin += span.getLeadingMargin(useFirstLineMargin);
}
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 4144a75..aecf488 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -201,13 +201,12 @@
restWidth -= sp[i].getLeadingMargin(false);
// LeadingMarginSpan2 is odd. The count affects all
- // leading margin spans, not just this particular one,
- // and start from the top of the span, not the top of the
- // paragraph.
+ // leading margin spans, not just this particular one
if (lms instanceof LeadingMarginSpan2) {
LeadingMarginSpan2 lms2 = (LeadingMarginSpan2) lms;
int lmsFirstLine = getLineForOffset(spanned.getSpanStart(lms2));
- firstWidthLineLimit = lmsFirstLine + lms2.getLeadingMarginLineCount();
+ firstWidthLineLimit = Math.max(firstWidthLineLimit,
+ lmsFirstLine + lms2.getLeadingMarginLineCount());
}
}
diff --git a/core/java/android/text/style/LeadingMarginSpan.java b/core/java/android/text/style/LeadingMarginSpan.java
index 2f429ff..96a7cd9 100644
--- a/core/java/android/text/style/LeadingMarginSpan.java
+++ b/core/java/android/text/style/LeadingMarginSpan.java
@@ -28,6 +28,9 @@
* margin spans on a single paragraph; they will be rendered in order, each
* adding its margin to the ones before it. The leading margin is on the right
* for lines in a right-to-left paragraph.
+ * <p>
+ * LeadingMarginSpans should be attached from the first character to the last
+ * character of a single paragraph.
*/
public interface LeadingMarginSpan
extends ParagraphStyle
@@ -69,18 +72,22 @@
/**
- * An extended version of {@link LeadingMarginSpan}, which allows
- * the implementor to specify the number of lines of text to which
- * this object is attached that the "first line of paragraph" margin
- * width will be applied to.
+ * An extended version of {@link LeadingMarginSpan}, which allows the
+ * implementor to specify the number of lines of the paragraph to which
+ * this object is attached that the "first line of paragraph" margin width
+ * will be applied to.
+ * <p>
+ * There should only be one LeadingMarginSpan2 per paragraph. The leading
+ * margin line count affects all LeadingMarginSpans in the paragraph,
+ * adjusting the number of lines to which the first line margin is applied.
+ * <p>
+ * As with LeadingMarginSpans, LeadingMarginSpan2s should be attached from
+ * the beginning to the end of a paragraph.
*/
public interface LeadingMarginSpan2 extends LeadingMarginSpan, WrapTogetherSpan {
/**
- * Returns the number of lines of text to which this object is
+ * Returns the number of lines of the paragraph to which this object is
* attached that the "first line" margin will apply to.
- * Note that if this returns N, the first N lines of the region,
- * not the first N lines of each paragraph, will be given the
- * special margin width.
*/
public int getLeadingMarginLineCount();
};
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index efcbdb3..6246cbe 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -16,13 +16,11 @@
package android.transition;
-import android.animation.TypeConverter;
import android.content.Context;
import android.graphics.PointF;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.RectEvaluator;
@@ -119,9 +117,11 @@
values.values.put(PROPNAME_BOUNDS, new Rect(view.getLeft(), view.getTop(),
view.getRight(), view.getBottom()));
values.values.put(PROPNAME_PARENT, values.view.getParent());
- values.view.getLocationInWindow(tempLocation);
- values.values.put(PROPNAME_WINDOW_X, tempLocation[0]);
- values.values.put(PROPNAME_WINDOW_Y, tempLocation[1]);
+ if (mReparent) {
+ values.view.getLocationInWindow(tempLocation);
+ values.values.put(PROPNAME_WINDOW_X, tempLocation[0]);
+ values.values.put(PROPNAME_WINDOW_Y, tempLocation[1]);
+ }
}
@Override
@@ -134,6 +134,19 @@
captureValues(transitionValues);
}
+ private boolean parentMatches(View startParent, View endParent) {
+ boolean parentMatches = true;
+ if (mReparent) {
+ TransitionValues endValues = getMatchedTransitionValues(startParent, true);
+ if (endValues == null) {
+ parentMatches = startParent == endParent;
+ } else {
+ parentMatches = endParent == endValues.view;
+ }
+ }
+ return parentMatches;
+ }
+
@Override
public Animator createAnimator(final ViewGroup sceneRoot, TransitionValues startValues,
TransitionValues endValues) {
@@ -148,13 +161,7 @@
return null;
}
final View view = endValues.view;
- boolean parentsEqual = (startParent == endParent) ||
- (startParent.getId() == endParent.getId());
- // TODO: Might want reparenting to be separate/subclass transition, or at least
- // triggered by a property on ChangeBounds. Otherwise, we're forcing the requirement that
- // all parents in layouts have IDs to avoid layout-inflation resulting in a side-effect
- // of reparenting the views.
- if (!mReparent || parentsEqual) {
+ if (parentMatches(startParent, endParent)) {
Rect startBounds = (Rect) startValues.values.get(PROPNAME_BOUNDS);
Rect endBounds = (Rect) endValues.values.get(PROPNAME_BOUNDS);
int startLeft = startBounds.left;
diff --git a/core/java/android/transition/ChangeImageTransform.java b/core/java/android/transition/ChangeImageTransform.java
index 2b26756..4b230eb 100644
--- a/core/java/android/transition/ChangeImageTransform.java
+++ b/core/java/android/transition/ChangeImageTransform.java
@@ -182,6 +182,7 @@
if (endMatrix == null) {
endMatrix = Matrix.IDENTITY_MATRIX;
}
+ ANIMATED_TRANSFORM_PROPERTY.set(imageView, startMatrix);
animator = createMatrixAnimator(imageView, startMatrix, endMatrix);
}
return animator;
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index 2fa8d2a..0d32d40 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -192,6 +192,8 @@
private TransitionValuesMaps mEndValues = new TransitionValuesMaps();
TransitionSet mParent = null;
private int[] mMatchOrder = DEFAULT_MATCH_ORDER;
+ ArrayList<TransitionValues> mStartValuesList; // only valid after playTransition starts
+ ArrayList<TransitionValues> mEndValuesList; // only valid after playTransitions starts
// Per-animator information used for later canceling when future transitions overlap
private static ThreadLocal<ArrayMap<Animator, AnimationInfo>> sRunningAnimators =
@@ -518,32 +520,28 @@
}
/**
- * Match start/end values by View instance. Adds matched values to startValuesList
- * and endValuesList and removes them from unmatchedStart and unmatchedEnd.
+ * Match start/end values by View instance. Adds matched values to mStartValuesList
+ * and mEndValuesList and removes them from unmatchedStart and unmatchedEnd.
*/
- private void matchInstances(ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList,
- ArrayMap<View, TransitionValues> unmatchedStart,
+ private void matchInstances(ArrayMap<View, TransitionValues> unmatchedStart,
ArrayMap<View, TransitionValues> unmatchedEnd) {
for (int i = unmatchedStart.size() - 1; i >= 0; i--) {
View view = unmatchedStart.keyAt(i);
TransitionValues end = unmatchedEnd.remove(view);
if (end != null) {
TransitionValues start = unmatchedStart.removeAt(i);
- startValuesList.add(start);
- endValuesList.add(end);
+ mStartValuesList.add(start);
+ mEndValuesList.add(end);
}
}
}
/**
- * Match start/end values by Adapter item ID. Adds matched values to startValuesList
- * and endValuesList and removes them from unmatchedStart and unmatchedEnd, using
+ * Match start/end values by Adapter item ID. Adds matched values to mStartValuesList
+ * and mEndValuesList and removes them from unmatchedStart and unmatchedEnd, using
* startItemIds and endItemIds as a guide for which Views have unique item IDs.
*/
- private void matchItemIds(ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList,
- ArrayMap<View, TransitionValues> unmatchedStart,
+ private void matchItemIds(ArrayMap<View, TransitionValues> unmatchedStart,
ArrayMap<View, TransitionValues> unmatchedEnd,
LongSparseArray<View> startItemIds, LongSparseArray<View> endItemIds) {
int numStartIds = startItemIds.size();
@@ -555,8 +553,8 @@
TransitionValues startValues = unmatchedStart.get(startView);
TransitionValues endValues = unmatchedEnd.get(endView);
if (startValues != null && endValues != null) {
- startValuesList.add(startValues);
- endValuesList.add(endValues);
+ mStartValuesList.add(startValues);
+ mEndValuesList.add(endValues);
unmatchedStart.remove(startView);
unmatchedEnd.remove(endView);
}
@@ -566,13 +564,11 @@
}
/**
- * Match start/end values by Adapter view ID. Adds matched values to startValuesList
- * and endValuesList and removes them from unmatchedStart and unmatchedEnd, using
+ * Match start/end values by Adapter view ID. Adds matched values to mStartValuesList
+ * and mEndValuesList and removes them from unmatchedStart and unmatchedEnd, using
* startIds and endIds as a guide for which Views have unique IDs.
*/
- private void matchIds(ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList,
- ArrayMap<View, TransitionValues> unmatchedStart,
+ private void matchIds(ArrayMap<View, TransitionValues> unmatchedStart,
ArrayMap<View, TransitionValues> unmatchedEnd,
SparseArray<View> startIds, SparseArray<View> endIds) {
int numStartIds = startIds.size();
@@ -584,8 +580,8 @@
TransitionValues startValues = unmatchedStart.get(startView);
TransitionValues endValues = unmatchedEnd.get(endView);
if (startValues != null && endValues != null) {
- startValuesList.add(startValues);
- endValuesList.add(endValues);
+ mStartValuesList.add(startValues);
+ mEndValuesList.add(endValues);
unmatchedStart.remove(startView);
unmatchedEnd.remove(endView);
}
@@ -595,13 +591,11 @@
}
/**
- * Match start/end values by Adapter transitionName. Adds matched values to startValuesList
- * and endValuesList and removes them from unmatchedStart and unmatchedEnd, using
+ * Match start/end values by Adapter transitionName. Adds matched values to mStartValuesList
+ * and mEndValuesList and removes them from unmatchedStart and unmatchedEnd, using
* startNames and endNames as a guide for which Views have unique transitionNames.
*/
- private void matchNames(ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList,
- ArrayMap<View, TransitionValues> unmatchedStart,
+ private void matchNames(ArrayMap<View, TransitionValues> unmatchedStart,
ArrayMap<View, TransitionValues> unmatchedEnd,
ArrayMap<String, View> startNames, ArrayMap<String, View> endNames) {
int numStartNames = startNames.size();
@@ -613,8 +607,8 @@
TransitionValues startValues = unmatchedStart.get(startView);
TransitionValues endValues = unmatchedEnd.get(endView);
if (startValues != null && endValues != null) {
- startValuesList.add(startValues);
- endValuesList.add(endValues);
+ mStartValuesList.add(startValues);
+ mEndValuesList.add(endValues);
unmatchedStart.remove(startView);
unmatchedEnd.remove(endView);
}
@@ -624,30 +618,26 @@
}
/**
- * Adds all values from unmatchedStart and unmatchedEnd to startValuesList and endValuesList,
+ * Adds all values from unmatchedStart and unmatchedEnd to mStartValuesList and mEndValuesList,
* assuming that there is no match between values in the list.
*/
- private void addUnmatched(ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList,
- ArrayMap<View, TransitionValues> unmatchedStart,
+ private void addUnmatched(ArrayMap<View, TransitionValues> unmatchedStart,
ArrayMap<View, TransitionValues> unmatchedEnd) {
// Views that only exist in the start Scene
for (int i = 0; i < unmatchedStart.size(); i++) {
- startValuesList.add(unmatchedStart.valueAt(i));
- endValuesList.add(null);
+ mStartValuesList.add(unmatchedStart.valueAt(i));
+ mEndValuesList.add(null);
}
// Views that only exist in the end Scene
for (int i = 0; i < unmatchedEnd.size(); i++) {
- endValuesList.add(unmatchedEnd.valueAt(i));
- startValuesList.add(null);
+ mEndValuesList.add(unmatchedEnd.valueAt(i));
+ mStartValuesList.add(null);
}
}
private void matchStartAndEnd(TransitionValuesMaps startValues,
- TransitionValuesMaps endValues,
- ArrayList<TransitionValues> startValuesList,
- ArrayList<TransitionValues> endValuesList) {
+ TransitionValuesMaps endValues) {
ArrayMap<View, TransitionValues> unmatchedStart =
new ArrayMap<View, TransitionValues>(startValues.viewValues);
ArrayMap<View, TransitionValues> unmatchedEnd =
@@ -656,23 +646,23 @@
for (int i = 0; i < mMatchOrder.length; i++) {
switch (mMatchOrder[i]) {
case MATCH_INSTANCE:
- matchInstances(startValuesList, endValuesList, unmatchedStart, unmatchedEnd);
+ matchInstances(unmatchedStart, unmatchedEnd);
break;
case MATCH_NAME:
- matchNames(startValuesList, endValuesList, unmatchedStart, unmatchedEnd,
+ matchNames(unmatchedStart, unmatchedEnd,
startValues.nameValues, endValues.nameValues);
break;
case MATCH_ID:
- matchIds(startValuesList, endValuesList, unmatchedStart, unmatchedEnd,
+ matchIds(unmatchedStart, unmatchedEnd,
startValues.idValues, endValues.idValues);
break;
case MATCH_ITEM_ID:
- matchItemIds(startValuesList, endValuesList, unmatchedStart, unmatchedEnd,
+ matchItemIds(unmatchedStart, unmatchedEnd,
startValues.itemIdValues, endValues.itemIdValues);
break;
}
}
- addUnmatched(startValuesList, endValuesList, unmatchedStart, unmatchedEnd);
+ addUnmatched(unmatchedStart, unmatchedEnd);
}
/**
@@ -687,19 +677,17 @@
* @hide
*/
protected void createAnimators(ViewGroup sceneRoot, TransitionValuesMaps startValues,
- TransitionValuesMaps endValues) {
+ TransitionValuesMaps endValues, ArrayList<TransitionValues> startValuesList,
+ ArrayList<TransitionValues> endValuesList) {
if (DBG) {
Log.d(LOG_TAG, "createAnimators() for " + this);
}
- ArrayList<TransitionValues> startValuesList = new ArrayList<TransitionValues>();
- ArrayList<TransitionValues> endValuesList = new ArrayList<TransitionValues>();
- matchStartAndEnd(startValues, endValues, startValuesList, endValuesList);
-
ArrayMap<Animator, AnimationInfo> runningAnimators = getRunningAnimators();
long minStartDelay = Long.MAX_VALUE;
int minAnimator = mAnimators.size();
SparseLongArray startDelays = new SparseLongArray();
- for (int i = 0; i < startValuesList.size(); ++i) {
+ int startValuesListCount = startValuesList.size();
+ for (int i = 0; i < startValuesListCount; ++i) {
TransitionValues start = startValuesList.get(i);
TransitionValues end = endValuesList.get(i);
// Only bother trying to animate with valid values that differ between start/end
@@ -1523,11 +1511,13 @@
mStartValues.idValues.clear();
mStartValues.itemIdValues.clear();
mStartValues.nameValues.clear();
+ mStartValuesList = null;
} else {
mEndValues.viewValues.clear();
mEndValues.idValues.clear();
mEndValues.itemIdValues.clear();
mEndValues.nameValues.clear();
+ mEndValuesList = null;
}
}
@@ -1613,6 +1603,45 @@
}
/**
+ * Find the matched start or end value for a given View. This is only valid
+ * after playTransition starts. For example, it will be valid in
+ * {@link #createAnimator(android.view.ViewGroup, TransitionValues, TransitionValues)}, but not
+ * in {@link #captureStartValues(TransitionValues)}.
+ *
+ * @param view The view to find the match for.
+ * @param viewInStart Is View from the start values or end values.
+ * @return The matching TransitionValues for view in either start or end values, depending
+ * on viewInStart or null if there is no match for the given view.
+ */
+ TransitionValues getMatchedTransitionValues(View view, boolean viewInStart) {
+ if (mParent != null) {
+ return mParent.getMatchedTransitionValues(view, viewInStart);
+ }
+ ArrayList<TransitionValues> lookIn = viewInStart ? mStartValuesList : mEndValuesList;
+ if (lookIn == null) {
+ return null;
+ }
+ int count = lookIn.size();
+ int index = -1;
+ for (int i = 0; i < count; i++) {
+ TransitionValues values = lookIn.get(i);
+ if (values == null) {
+ return null;
+ }
+ if (values.view == view) {
+ index = i;
+ break;
+ }
+ }
+ TransitionValues values = null;
+ if (index >= 0) {
+ ArrayList<TransitionValues> matchIn = viewInStart ? mEndValuesList : mStartValuesList;
+ values = matchIn.get(index);
+ }
+ return values;
+ }
+
+ /**
* Pauses this transition, sending out calls to {@link
* TransitionListener#onTransitionPause(Transition)} to all listeners
* and pausing all running animators started by this transition.
@@ -1684,6 +1713,10 @@
* runAnimations() to actually start the animations.
*/
void playTransition(ViewGroup sceneRoot) {
+ mStartValuesList = new ArrayList<TransitionValues>();
+ mEndValuesList = new ArrayList<TransitionValues>();
+ matchStartAndEnd(mStartValues, mEndValues);
+
ArrayMap<Animator, AnimationInfo> runningAnimators = getRunningAnimators();
int numOldAnims = runningAnimators.size();
WindowId windowId = sceneRoot.getWindowId();
@@ -1694,7 +1727,7 @@
if (oldInfo != null && oldInfo.view != null && oldInfo.windowId == windowId) {
TransitionValues oldValues = oldInfo.values;
View oldView = oldInfo.view;
- TransitionValues newValues = mEndValues.viewValues.get(oldView);
+ TransitionValues newValues = getMatchedTransitionValues(oldView, true);
boolean cancel = oldInfo.transition.areValuesChanged(oldValues, newValues);
if (cancel) {
if (anim.isRunning() || anim.isStarted()) {
@@ -1713,7 +1746,7 @@
}
}
- createAnimators(sceneRoot, mStartValues, mEndValues);
+ createAnimators(sceneRoot, mStartValues, mEndValues, mStartValuesList, mEndValuesList);
runAnimators();
}
@@ -2055,6 +2088,8 @@
clone.mAnimators = new ArrayList<Animator>();
clone.mStartValues = new TransitionValuesMaps();
clone.mEndValues = new TransitionValuesMaps();
+ clone.mStartValuesList = null;
+ clone.mEndValuesList = null;
} catch (CloneNotSupportedException e) {}
return clone;
diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java
index 83c60af..f6499ae 100644
--- a/core/java/android/transition/TransitionSet.java
+++ b/core/java/android/transition/TransitionSet.java
@@ -151,6 +151,31 @@
}
/**
+ * Returns the number of child transitions in the TransitionSet.
+ *
+ * @return The number of child transitions in the TransitionSet.
+ * @see #addTransition(Transition)
+ * @see #getTransitionAt(int)
+ */
+ public int getTransitionCount() {
+ return mTransitions.size();
+ }
+
+ /**
+ * Returns the child Transition at the specified position in the TransitionSet.
+ *
+ * @param index The position of the Transition to retrieve.
+ * @see #addTransition(Transition)
+ * @see #getTransitionCount()
+ */
+ public Transition getTransitionAt(int index) {
+ if (index < 0 || index >= mTransitions.size()) {
+ return null;
+ }
+ return mTransitions.get(index);
+ }
+
+ /**
* Setting a non-negative duration on a TransitionSet causes all of the child
* transitions (current and future) to inherit this duration.
*
@@ -361,11 +386,13 @@
*/
@Override
protected void createAnimators(ViewGroup sceneRoot, TransitionValuesMaps startValues,
- TransitionValuesMaps endValues) {
+ TransitionValuesMaps endValues, ArrayList<TransitionValues> startValuesList,
+ ArrayList<TransitionValues> endValuesList) {
startValues = removeExcludes(startValues);
endValues = removeExcludes(endValues);
for (Transition childTransition : mTransitions) {
- childTransition.createAnimators(sceneRoot, startValues, endValues);
+ childTransition.createAnimators(sceneRoot, startValues, endValues, startValuesList,
+ endValuesList);
}
}
diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java
index 9a0b7fc..3889cb6 100644
--- a/core/java/android/util/ArrayMap.java
+++ b/core/java/android/util/ArrayMap.java
@@ -410,7 +410,7 @@
/**
* Add a new value to the array map.
- * @param key The key under which to store the value. <b>Must not be null.</b> If
+ * @param key The key under which to store the value. If
* this key already exists in the array, its value will be replaced.
* @param value The value to store for the given key.
* @return Returns the old value that was stored for the given key, or null if there
@@ -496,6 +496,44 @@
}
/**
+ * The use of the {@link #append} function can result in invalid array maps, in particular
+ * an array map where the same key appears multiple times. This function verifies that
+ * the array map is valid, throwing IllegalArgumentException if a problem is found. The
+ * main use for this method is validating an array map after unpacking from an IPC, to
+ * protect against malicious callers.
+ * @hide
+ */
+ public void validate() {
+ final int N = mSize;
+ if (N <= 1) {
+ // There can't be dups.
+ return;
+ }
+ int basehash = mHashes[0];
+ int basei = 0;
+ for (int i=1; i<N; i++) {
+ int hash = mHashes[i];
+ if (hash != basehash) {
+ basehash = hash;
+ basei = i;
+ continue;
+ }
+ // We are in a run of entries with the same hash code. Go backwards through
+ // the array to see if any keys are the same.
+ final Object cur = mArray[i<<1];
+ for (int j=i-1; j>=basei; j--) {
+ final Object prev = mArray[j<<1];
+ if (cur == prev) {
+ throw new IllegalArgumentException("Duplicate key in ArrayMap: " + cur);
+ }
+ if (cur != null && prev != null && cur.equals(prev)) {
+ throw new IllegalArgumentException("Duplicate key in ArrayMap: " + cur);
+ }
+ }
+ }
+ }
+
+ /**
* Perform a {@link #put(Object, Object)} of all key/value pairs in <var>array</var>
* @param array The array whose contents are to be retrieved.
*/
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 3f10b92..946a3f7 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -68,7 +68,7 @@
/**
* Intermediate density for screens that sit somewhere between
- * {@link #DENSITY_XHIGH} (320dpi) and {@link #DENSITY_XXHIGH} (480 dpi).
+ * {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi).
* This is not a density that applications should target, instead relying
* on the system to scale their {@link #DENSITY_XXHIGH} assets for them.
*/
@@ -80,6 +80,14 @@
public static final int DENSITY_XXHIGH = 480;
/**
+ * Intermediate density for screens that sit somewhere between
+ * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (560 dpi).
+ * This is not a density that applications should target, instead relying
+ * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them.
+ */
+ public static final int DENSITY_560 = 560;
+
+ /**
* Standard quantized DPI for extra-extra-extra-high-density screens. Applications
* should not generally worry about this density; relying on XHIGH graphics
* being scaled up to it should be sufficient for almost all cases. A typical
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 83767cb..7deb9c8 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -121,7 +121,8 @@
boolean isKeyguardSecure();
boolean inKeyguardRestrictedInputMode();
void dismissKeyguard();
- void keyguardGoingAway();
+ void keyguardGoingAway(boolean disableWindowAnimations,
+ boolean keyguardGoingToNotificationShade);
void closeSystemDialogs(String reason);
diff --git a/core/java/android/view/MenuItem.java b/core/java/android/view/MenuItem.java
index 2dfbcb5..e706c9c 100644
--- a/core/java/android/view/MenuItem.java
+++ b/core/java/android/view/MenuItem.java
@@ -258,8 +258,8 @@
/**
* Change both the numeric and alphabetic shortcut associated with this
* item. Note that the shortcut will be triggered when the key that
- * generates the given character is pressed alone or along with with the alt
- * key. Also note that case is not significant and that alphabetic shortcut
+ * generates the given character is pressed along with the ctrl key.
+ * Also note that case is not significant and that alphabetic shortcut
* characters will be displayed in lower case.
* <p>
* See {@link Menu} for the menu types that support shortcuts.
@@ -293,9 +293,9 @@
/**
* Change the alphabetic shortcut associated with this item. The shortcut
* will be triggered when the key that generates the given character is
- * pressed alone or along with with the alt key. Case is not significant and
- * shortcut characters will be displayed in lower case. Note that menu items
- * with the characters '\b' or '\n' as shortcuts will get triggered by the
+ * pressed along with the ctrl key. Case is not significant and shortcut
+ * characters will be displayed in lower case. Note that menu items with
+ * the characters '\b' or '\n' as shortcuts will get triggered by the
* Delete key or Carriage Return key, respectively.
* <p>
* See {@link Menu} for the menu types that support shortcuts.
@@ -596,4 +596,4 @@
* @return This menu item instance for call chaining
*/
public MenuItem setOnActionExpandListener(OnActionExpandListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 01c7467..f17daaf 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -89,7 +89,6 @@
import com.android.internal.R;
import com.android.internal.util.Predicate;
import com.android.internal.view.menu.MenuBuilder;
-
import com.google.android.collect.Lists;
import com.google.android.collect.Maps;
@@ -701,6 +700,13 @@
public static final String DEBUG_LAYOUT_PROPERTY = "debug.layout";
/**
+ * When set to true, this view will save its attribute data.
+ *
+ * @hide
+ */
+ public static boolean mDebugViewAttributes = false;
+
+ /**
* Used to mark a View that has no ID.
*/
public static final int NO_ID = -1;
@@ -3255,6 +3261,7 @@
* This field should be made private, so it is hidden from the SDK.
* {@hide}
*/
+ @ViewDebug.ExportedProperty(deepExport = true)
protected Context mContext;
private final Resources mResources;
@@ -3525,6 +3532,18 @@
GhostView mGhostView;
/**
+ * Holds pairs of adjacent attribute data: attribute name followed by its value.
+ * @hide
+ */
+ @ViewDebug.ExportedProperty(category = "attributes", hasAdjacentMapping = true)
+ public String[] mAttributes;
+
+ /**
+ * Maps a Resource id to its name.
+ */
+ private static SparseArray<String> mAttributeMap;
+
+ /**
* Simple constructor to use when creating a view from code.
*
* @param context The Context the view is running in, through which it can
@@ -3642,6 +3661,10 @@
final TypedArray a = context.obtainStyledAttributes(
attrs, com.android.internal.R.styleable.View, defStyleAttr, defStyleRes);
+ if (mDebugViewAttributes) {
+ saveAttributeData(attrs, a);
+ }
+
Drawable background = null;
int leftPadding = -1;
@@ -4024,6 +4047,10 @@
mBackgroundTintMode = Drawable.parseTintMode(a.getInt(
R.styleable.View_backgroundTintMode, -1), mBackgroundTintMode);
break;
+ case R.styleable.View_outlineProvider:
+ setOutlineProviderFromAttribute(a.getInt(R.styleable.View_outlineProvider,
+ PROVIDER_BACKGROUND));
+ break;
}
}
@@ -4137,6 +4164,51 @@
mRenderNode = RenderNode.create(getClass().getName());
}
+ private static SparseArray<String> getAttributeMap() {
+ if (mAttributeMap == null) {
+ mAttributeMap = new SparseArray<String>();
+ }
+ return mAttributeMap;
+ }
+
+ private void saveAttributeData(AttributeSet attrs, TypedArray a) {
+ int length = ((attrs == null ? 0 : attrs.getAttributeCount()) + a.getIndexCount()) * 2;
+ mAttributes = new String[length];
+
+ int i = 0;
+ if (attrs != null) {
+ for (i = 0; i < attrs.getAttributeCount(); i += 2) {
+ mAttributes[i] = attrs.getAttributeName(i);
+ mAttributes[i + 1] = attrs.getAttributeValue(i);
+ }
+
+ }
+
+ SparseArray<String> attributeMap = getAttributeMap();
+ for (int j = 0; j < a.length(); ++j) {
+ if (a.hasValue(j)) {
+ try {
+ int resourceId = a.getResourceId(j, 0);
+ if (resourceId == 0) {
+ continue;
+ }
+
+ String resourceName = attributeMap.get(resourceId);
+ if (resourceName == null) {
+ resourceName = a.getResources().getResourceName(resourceId);
+ attributeMap.put(resourceId, resourceName);
+ }
+
+ mAttributes[i] = resourceName;
+ mAttributes[i + 1] = a.getText(j).toString();
+ i += 2;
+ } catch (Resources.NotFoundException e) {
+ // if we can't get the resource name, we just ignore it
+ }
+ }
+ }
+ }
+
public String toString() {
StringBuilder out = new StringBuilder(128);
out.append(getClass().getName());
@@ -10756,14 +10828,6 @@
}
/**
- * Deprecated, pending removal
- *
- * @hide
- */
- @Deprecated
- public void setOutline(@Nullable Outline outline) {}
-
- /**
* Returns whether the Outline should be used to clip the contents of the View.
* <p>
* Note that this flag will only be respected if the View's Outline returns true from
@@ -10792,6 +10856,28 @@
}
}
+ // correspond to the enum values of View_outlineProvider
+ private static final int PROVIDER_BACKGROUND = 0;
+ private static final int PROVIDER_NONE = 1;
+ private static final int PROVIDER_BOUNDS = 2;
+ private static final int PROVIDER_PADDED_BOUNDS = 3;
+ private void setOutlineProviderFromAttribute(int providerInt) {
+ switch (providerInt) {
+ case PROVIDER_BACKGROUND:
+ setOutlineProvider(ViewOutlineProvider.BACKGROUND);
+ break;
+ case PROVIDER_NONE:
+ setOutlineProvider(null);
+ break;
+ case PROVIDER_BOUNDS:
+ setOutlineProvider(ViewOutlineProvider.BOUNDS);
+ break;
+ case PROVIDER_PADDED_BOUNDS:
+ setOutlineProvider(ViewOutlineProvider.PADDED_BOUNDS);
+ break;
+ }
+ }
+
/**
* Sets the {@link ViewOutlineProvider} of the view, which generates the Outline that defines
* the shape of the shadow it casts, and enables outline clipping.
@@ -13763,6 +13849,7 @@
} else {
draw(canvas);
}
+ drawAccessibilityFocus(canvas);
}
} finally {
renderNode.end(canvas);
@@ -14057,6 +14144,7 @@
} else {
draw(canvas);
}
+ drawAccessibilityFocus(canvas);
canvas.restoreToCount(restoreCount);
canvas.setBitmap(null);
@@ -14131,6 +14219,7 @@
} else {
draw(canvas);
}
+ drawAccessibilityFocus(canvas);
mPrivateFlags = flags;
@@ -14704,8 +14793,10 @@
if (layerType == LAYER_TYPE_HARDWARE && !usingRenderNodeProperties) {
final HardwareLayer layer = getHardwareLayer();
if (layer != null && layer.isValid()) {
+ int restoreAlpha = mLayerPaint.getAlpha();
mLayerPaint.setAlpha((int) (alpha * 255));
((HardwareCanvas) canvas).drawHardwareLayer(layer, 0, 0, mLayerPaint);
+ mLayerPaint.setAlpha(restoreAlpha);
layerRendered = true;
} else {
final int scrollX = hasDisplayList ? 0 : sx;
@@ -14722,9 +14813,13 @@
if ((mPrivateFlags & PFLAG_SKIP_DRAW) == PFLAG_SKIP_DRAW) {
mPrivateFlags &= ~PFLAG_DIRTY_MASK;
dispatchDraw(canvas);
+ if (mOverlay != null && !mOverlay.isEmpty()) {
+ mOverlay.getOverlayView().draw(canvas);
+ }
} else {
draw(canvas);
}
+ drawAccessibilityFocus(canvas);
} else {
mPrivateFlags &= ~PFLAG_DIRTY_MASK;
((HardwareCanvas) canvas).drawRenderNode(renderNode, null, flags);
@@ -14733,6 +14828,7 @@
} else if (cache != null) {
mPrivateFlags &= ~PFLAG_DIRTY_MASK;
Paint cachePaint;
+ int restoreAlpha = 0;
if (layerType == LAYER_TYPE_NONE) {
cachePaint = parent.mCachePaint;
@@ -14741,18 +14837,13 @@
cachePaint.setDither(false);
parent.mCachePaint = cachePaint;
}
- if (alpha < 1) {
- cachePaint.setAlpha((int) (alpha * 255));
- parent.mGroupFlags |= ViewGroup.FLAG_ALPHA_LOWER_THAN_ONE;
- } else if ((flags & ViewGroup.FLAG_ALPHA_LOWER_THAN_ONE) != 0) {
- cachePaint.setAlpha(255);
- parent.mGroupFlags &= ~ViewGroup.FLAG_ALPHA_LOWER_THAN_ONE;
- }
} else {
cachePaint = mLayerPaint;
- cachePaint.setAlpha((int) (alpha * 255));
+ restoreAlpha = mLayerPaint.getAlpha();
}
+ cachePaint.setAlpha((int) (alpha * 255));
canvas.drawBitmap(cache, 0.0f, 0.0f, cachePaint);
+ cachePaint.setAlpha(restoreAlpha);
}
if (restoreTo >= 0) {
@@ -14980,6 +15071,45 @@
}
/**
+ * Draws the accessibility focus rect onto the specified canvas.
+ *
+ * @param canvas Canvas on which to draw the focus rect
+ */
+ private void drawAccessibilityFocus(Canvas canvas) {
+ if (mAttachInfo == null) {
+ return;
+ }
+
+ final Rect bounds = mAttachInfo.mTmpInvalRect;
+ final ViewRootImpl viewRoot = getViewRootImpl();
+ if (viewRoot == null || viewRoot.getAccessibilityFocusedHost() != this) {
+ return;
+ }
+
+ final AccessibilityManager manager = AccessibilityManager.getInstance(mContext);
+ if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) {
+ return;
+ }
+
+ final Drawable drawable = viewRoot.getAccessibilityFocusedDrawable();
+ if (drawable == null) {
+ return;
+ }
+
+ final AccessibilityNodeInfo virtualView = viewRoot.getAccessibilityFocusedVirtualView();
+ if (virtualView != null) {
+ virtualView.getBoundsInParent(bounds);
+ } else {
+ bounds.set(0, 0, mRight - mLeft, mBottom - mTop);
+ }
+
+ canvas.translate(mScrollX, mScrollY);
+ drawable.setBounds(bounds);
+ drawable.draw(canvas);
+ canvas.translate(-mScrollX, -mScrollY);
+ }
+
+ /**
* Draws the background onto the specified canvas.
*
* @param canvas Canvas on which to draw the background
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 4d9a8cc..6c66eb0 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -187,6 +187,15 @@
* @return true if the supported values should be formatted as a hex string.
*/
boolean formatToHexString() default false;
+
+ /**
+ * Indicates whether or not the key to value mappings are held in adjacent indices.
+ *
+ * Note: Applies only to fields and methods that return String[].
+ *
+ * @return true if the key to value mappings are held in adjacent indices.
+ */
+ boolean hasAdjacentMapping() default false;
}
/**
@@ -1056,7 +1065,6 @@
Class<?> klass, String prefix) throws IOException {
final Method[] methods = getExportedPropertyMethods(klass);
-
int count = methods.length;
for (int i = 0; i < count; i++) {
final Method method = methods[i];
@@ -1108,6 +1116,19 @@
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
continue;
+ } else if (returnType == String[].class) {
+ final String[] array = (String[]) methodValue;
+ if (property.hasAdjacentMapping() && array != null) {
+ for (int j = 0; j < array.length; j += 2) {
+ if (array[j] != null) {
+ writeEntry(out, categoryPrefix + prefix, array[j], "()",
+ array[j + 1] == null ? "null" : array[j + 1]);
+ }
+
+ }
+ }
+
+ continue;
} else if (!returnType.isPrimitive()) {
if (property.deepExport()) {
dumpViewProperties(context, methodValue, out, prefix + property.prefix());
@@ -1187,6 +1208,18 @@
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
continue;
+ } else if (type == String[].class) {
+ final String[] array = (String[]) field.get(view);
+ if (property.hasAdjacentMapping() && array != null) {
+ for (int j = 0; j < array.length; j += 2) {
+ if (array[j] != null) {
+ writeEntry(out, categoryPrefix + prefix, array[j], "",
+ array[j + 1] == null ? "null" : array[j + 1]);
+ }
+ }
+ }
+
+ continue;
} else if (!type.isPrimitive()) {
if (property.deepExport()) {
dumpViewProperties(context, field.get(view), out, prefix +
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 7f15381..19dd583 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -279,9 +279,7 @@
*/
protected static final int FLAG_SUPPORT_STATIC_TRANSFORMATIONS = 0x800;
- // When the previous drawChild() invocation used an alpha value that was lower than
- // 1.0 and set it in mCachePaint
- static final int FLAG_ALPHA_LOWER_THAN_ONE = 0x1000;
+ // UNUSED FLAG VALUE: 0x1000;
/**
* When set, this ViewGroup's drawable states also include those
diff --git a/core/java/android/view/ViewOutlineProvider.java b/core/java/android/view/ViewOutlineProvider.java
index 170c5d8..a1a02f6 100644
--- a/core/java/android/view/ViewOutlineProvider.java
+++ b/core/java/android/view/ViewOutlineProvider.java
@@ -44,6 +44,35 @@
};
/**
+ * Maintains the outline of the View to match its rectangular bounds,
+ * at <code>1.0f</code> alpha.
+ *
+ * This can be used to enable Views that are opaque but lacking a background cast a shadow.
+ */
+ public static final ViewOutlineProvider BOUNDS = new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRect(0, 0, view.getWidth(), view.getHeight());
+ }
+ };
+
+ /**
+ * Maintains the outline of the View to match its rectangular padded bounds,
+ * at <code>1.0f</code> alpha.
+ *
+ * This can be used to enable Views that are opaque but lacking a background cast a shadow.
+ */
+ public static final ViewOutlineProvider PADDED_BOUNDS = new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRect(view.getPaddingLeft(),
+ view.getPaddingTop(),
+ view.getWidth() - view.getPaddingRight(),
+ view.getHeight() - view.getPaddingBottom());
+ }
+ };
+
+ /**
* Called to get the provider to populate the Outline.
*
* This method will be called by a View when its owned Drawables are invalidated, when the
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 92e0245..bb469a3 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2244,7 +2244,6 @@
canvas.drawHardwareLayer(mResizeBuffer, mHardwareXOffset, mHardwareYOffset,
mResizePaint);
}
- drawAccessibilityFocusedDrawableIfNeeded(canvas);
}
/**
@@ -2462,25 +2461,9 @@
if (mHardwareYOffset != yOffset || mHardwareXOffset != xOffset) {
mHardwareYOffset = yOffset;
mHardwareXOffset = xOffset;
- invalidateRoot = true;
- }
- mResizeAlpha = resizeAlpha;
-
- if (!invalidateRoot) {
- // If accessibility focus moved, invalidate the root.
- final Drawable drawable = mAttachInfo.mAccessibilityFocusDrawable;
- if (drawable != null) {
- final Rect bounds = mAttachInfo.mTmpInvalRect;
- if (getAccessibilityFocusedRect(bounds)
- && !bounds.equals(drawable.getBounds())) {
- invalidateRoot = true;
- }
- }
- }
-
- if (invalidateRoot) {
mAttachInfo.mHardwareRenderer.invalidateRoot();
}
+ mResizeAlpha = resizeAlpha;
dirty.setEmpty();
@@ -2600,8 +2583,6 @@
attachInfo.mSetIgnoreDirtyState = false;
mView.draw(canvas);
-
- drawAccessibilityFocusedDrawableIfNeeded(canvas);
} finally {
if (!attachInfo.mSetIgnoreDirtyState) {
// Only clear the flag if it was not set during the mView.draw() call
@@ -2625,54 +2606,7 @@
return true;
}
- /**
- * We want to draw a highlight around the current accessibility focused.
- * Since adding a style for all possible view is not a viable option we
- * have this specialized drawing method.
- *
- * Note: We are doing this here to be able to draw the highlight for
- * virtual views in addition to real ones.
- *
- * @param canvas The canvas on which to draw.
- */
- private void drawAccessibilityFocusedDrawableIfNeeded(Canvas canvas) {
- final Rect bounds = mAttachInfo.mTmpInvalRect;
- if (getAccessibilityFocusedRect(bounds)) {
- final Drawable drawable = getAccessibilityFocusedDrawable();
- if (drawable != null) {
- drawable.setBounds(bounds);
- drawable.draw(canvas);
- }
- }
- }
-
- private boolean getAccessibilityFocusedRect(Rect bounds) {
- final AccessibilityManager manager = AccessibilityManager.getInstance(mView.mContext);
- if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) {
- return false;
- }
-
- final View host = mAccessibilityFocusedHost;
- if (host == null || host.mAttachInfo == null) {
- return false;
- }
-
- final AccessibilityNodeProvider provider = host.getAccessibilityNodeProvider();
- if (provider == null) {
- host.getBoundsOnScreen(bounds);
- } else if (mAccessibilityFocusedVirtualView != null) {
- mAccessibilityFocusedVirtualView.getBoundsInScreen(bounds);
- } else {
- return false;
- }
-
- final AttachInfo attachInfo = mAttachInfo;
- bounds.offset(-attachInfo.mWindowLeft, -attachInfo.mWindowTop);
- bounds.intersect(0, 0, attachInfo.mViewRootImpl.mWidth, attachInfo.mViewRootImpl.mHeight);
- return true;
- }
-
- private Drawable getAccessibilityFocusedDrawable() {
+ Drawable getAccessibilityFocusedDrawable() {
// Lazily load the accessibility focus drawable.
if (mAttachInfo.mAccessibilityFocusDrawable == null) {
final TypedValue value = new TypedValue();
diff --git a/core/java/android/view/WindowCallbackWrapper.java b/core/java/android/view/WindowCallbackWrapper.java
new file mode 100644
index 0000000..35a6a76
--- /dev/null
+++ b/core/java/android/view/WindowCallbackWrapper.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package android.view;
+
+import android.view.accessibility.AccessibilityEvent;
+
+/**
+ * A simple decorator stub for Window.Callback that passes through any calls
+ * to the wrapped instance as a base implementation. Call super.foo() to call into
+ * the wrapped callback for any subclasses.
+ *
+ * @hide for internal use
+ */
+public class WindowCallbackWrapper implements Window.Callback {
+ private Window.Callback mWrapped;
+
+ public WindowCallbackWrapper(Window.Callback wrapped) {
+ if (wrapped == null) {
+ throw new IllegalArgumentException("Window callback may not be null");
+ }
+ mWrapped = wrapped;
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ return mWrapped.dispatchKeyEvent(event);
+ }
+
+ @Override
+ public boolean dispatchKeyShortcutEvent(KeyEvent event) {
+ return mWrapped.dispatchKeyShortcutEvent(event);
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent event) {
+ return mWrapped.dispatchTouchEvent(event);
+ }
+
+ @Override
+ public boolean dispatchTrackballEvent(MotionEvent event) {
+ return mWrapped.dispatchTrackballEvent(event);
+ }
+
+ @Override
+ public boolean dispatchGenericMotionEvent(MotionEvent event) {
+ return mWrapped.dispatchGenericMotionEvent(event);
+ }
+
+ @Override
+ public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
+ return mWrapped.dispatchPopulateAccessibilityEvent(event);
+ }
+
+ @Override
+ public View onCreatePanelView(int featureId) {
+ return mWrapped.onCreatePanelView(featureId);
+ }
+
+ @Override
+ public boolean onCreatePanelMenu(int featureId, Menu menu) {
+ return mWrapped.onCreatePanelMenu(featureId, menu);
+ }
+
+ @Override
+ public boolean onPreparePanel(int featureId, View view, Menu menu) {
+ return mWrapped.onPreparePanel(featureId, view, menu);
+ }
+
+ @Override
+ public boolean onMenuOpened(int featureId, Menu menu) {
+ return mWrapped.onMenuOpened(featureId, menu);
+ }
+
+ @Override
+ public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ return mWrapped.onMenuItemSelected(featureId, item);
+ }
+
+ @Override
+ public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) {
+ mWrapped.onWindowAttributesChanged(attrs);
+ }
+
+ @Override
+ public void onContentChanged() {
+ mWrapped.onContentChanged();
+ }
+
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ mWrapped.onWindowFocusChanged(hasFocus);
+ }
+
+ @Override
+ public void onAttachedToWindow() {
+ mWrapped.onAttachedToWindow();
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ mWrapped.onDetachedFromWindow();
+ }
+
+ @Override
+ public void onPanelClosed(int featureId, Menu menu) {
+ mWrapped.onPanelClosed(featureId, menu);
+ }
+
+ @Override
+ public boolean onSearchRequested() {
+ return mWrapped.onSearchRequested();
+ }
+
+ @Override
+ public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {
+ return mWrapped.onWindowStartingActionMode(callback);
+ }
+
+ @Override
+ public void onActionModeStarted(ActionMode mode) {
+ mWrapped.onActionModeStarted(mode);
+ }
+
+ @Override
+ public void onActionModeFinished(ActionMode mode) {
+ mWrapped.onActionModeFinished(mode);
+ }
+}
+
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index b6c650d..053fdd0 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -737,13 +737,14 @@
/**
* Create and return an animation to re-display a force hidden window.
*/
- public Animation createForceHideEnterAnimation(boolean onWallpaper);
+ public Animation createForceHideEnterAnimation(boolean onWallpaper,
+ boolean goingToNotificationShade);
/**
* Create and return an animation to let the wallpaper disappear after being shown on a force
* hiding window.
*/
- public Animation createForceHideWallpaperExitAnimation();
+ public Animation createForceHideWallpaperExitAnimation(boolean goingToNotificationShade);
/**
* Called from the input reader thread before a key is enqueued.
@@ -1014,6 +1015,11 @@
public void dismissKeyguardLw();
/**
+ * Notifies the keyguard that the activity has drawn it was waiting for.
+ */
+ public void notifyActivityDrawnForKeyguardLw();
+
+ /**
* Ask the policy whether the Keyguard has drawn. If the Keyguard is disabled, this method
* returns true as soon as we know that Keyguard is disabled.
*
diff --git a/core/java/android/view/accessibility/AccessibilityCache.java b/core/java/android/view/accessibility/AccessibilityCache.java
index 4f34231..ca6437a 100644
--- a/core/java/android/view/accessibility/AccessibilityCache.java
+++ b/core/java/android/view/accessibility/AccessibilityCache.java
@@ -36,7 +36,7 @@
private static final boolean DEBUG = false;
- private static final boolean CHECK_INTEGRITY = Build.IS_DEBUGGABLE;
+ private static final boolean CHECK_INTEGRITY = "eng".equals(Build.TYPE);
private final Object mLock = new Object();
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 623b5f9..eec3570 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1655,7 +1655,12 @@
final boolean isImmediate = (mCursorAnchorInfoMonitorMode &
CursorAnchorInfoRequest.FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE) != 0;
if (!isImmediate && Objects.equals(mCursorAnchorInfo, cursorAnchorInfo)) {
- Log.w(TAG, "Ignoring redundant updateCursorAnchorInfo: info=" + cursorAnchorInfo);
+ // TODO: Consider always emitting this message once we have addressed redundant
+ // calls of this method from android.widget.Editor.
+ if (DEBUG) {
+ Log.w(TAG, "Ignoring redundant updateCursorAnchorInfo: info="
+ + cursorAnchorInfo);
+ }
return;
}
if (DEBUG) Log.v(TAG, "updateCursorAnchorInfo: " + cursorAnchorInfo);
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index e07a6e3..1b0cb3d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1730,9 +1730,12 @@
* <ul>
* <li> This method can be used to allow JavaScript to control the host
* application. This is a powerful feature, but also presents a security
- * risk for applications targeted to API level
- * {@link android.os.Build.VERSION_CODES#JELLY_BEAN} or below, because
- * JavaScript could use reflection to access an
+ * risk for apps targeting {@link android.os.Build.VERSION_CODES#JELLY_BEAN} or earlier.
+ * Apps that target a version later than {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
+ * are still vulnerable if the app runs on a device running Android earlier than 4.2.
+ * The most secure way to use this method is to target {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
+ * and to ensure the method is called only when running on Android 4.2 or later.
+ * With these older versions, JavaScript could use reflection to access an
* injected object's public fields. Use of this method in a WebView
* containing untrusted content could allow an attacker to manipulate the
* host application in unintended ways, executing Java code with the
@@ -1740,7 +1743,8 @@
* method in a WebView which could contain untrusted content.</li>
* <li> JavaScript interacts with Java object on a private, background
* thread of this WebView. Care is therefore required to maintain thread
- * safety.</li>
+ * safety.
+ * </li>
* <li> The Java object's fields are not accessible.</li>
* <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#L}
* and above, methods of injected Java objects are enumerable from
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 23894ee..c7ffedc 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -29,6 +29,7 @@
import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemProperties;
+import android.os.Trace;
import android.text.TextUtils;
import android.util.AndroidRuntimeException;
import android.util.Log;
@@ -71,38 +72,55 @@
private static WebViewFactoryProvider sProviderInstance;
private static final Object sProviderLock = new Object();
private static boolean sAddressSpaceReserved = false;
+ private static PackageInfo sPackageInfo;
public static String getWebViewPackageName() {
return AppGlobals.getInitialApplication().getString(
com.android.internal.R.string.config_webViewPackageName);
}
+ public static PackageInfo getLoadedPackageInfo() {
+ return sPackageInfo;
+ }
+
static WebViewFactoryProvider getProvider() {
synchronized (sProviderLock) {
// For now the main purpose of this function (and the factory abstraction) is to keep
// us honest and minimize usage of WebView internals when binding the proxy.
if (sProviderInstance != null) return sProviderInstance;
- loadNativeLibrary();
-
- Class<WebViewFactoryProvider> providerClass;
+ Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getProvider()");
try {
- providerClass = getFactoryClass();
- } catch (ClassNotFoundException e) {
- Log.e(LOGTAG, "error loading provider", e);
- throw new AndroidRuntimeException(e);
- }
+ Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()");
+ loadNativeLibrary();
+ Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
- try {
- sProviderInstance = providerClass.newInstance();
- if (DEBUG) Log.v(LOGTAG, "Loaded provider: " + sProviderInstance);
- return sProviderInstance;
- } catch (Exception e) {
- Log.e(LOGTAG, "error instantiating provider", e);
- throw new AndroidRuntimeException(e);
+ Class<WebViewFactoryProvider> providerClass;
+ Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getFactoryClass()");
+ try {
+ providerClass = getFactoryClass();
+ } catch (ClassNotFoundException e) {
+ Log.e(LOGTAG, "error loading provider", e);
+ throw new AndroidRuntimeException(e);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
+ }
+
+ StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+ Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "providerClass.newInstance()");
+ try {
+ sProviderInstance = providerClass.newInstance();
+ if (DEBUG) Log.v(LOGTAG, "Loaded provider: " + sProviderInstance);
+ return sProviderInstance;
+ } catch (Exception e) {
+ Log.e(LOGTAG, "error instantiating provider", e);
+ throw new AndroidRuntimeException(e);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
} finally {
- StrictMode.setThreadPolicy(oldPolicy);
+ Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
}
}
}
@@ -112,9 +130,9 @@
try {
// First fetch the package info so we can log the webview package version.
String packageName = getWebViewPackageName();
- PackageInfo pi = initialApplication.getPackageManager().getPackageInfo(packageName, 0);
- Log.i(LOGTAG, "Loading " + packageName + " version " + pi.versionName +
- " (code " + pi.versionCode + ")");
+ sPackageInfo = initialApplication.getPackageManager().getPackageInfo(packageName, 0);
+ Log.i(LOGTAG, "Loading " + packageName + " version " + sPackageInfo.versionName +
+ " (code " + sPackageInfo.versionCode + ")");
// Construct a package context to load the Java code into the current app.
Context webViewContext = initialApplication.createPackageContext(packageName,
@@ -122,8 +140,13 @@
initialApplication.getAssets().addAssetPath(
webViewContext.getApplicationInfo().sourceDir);
ClassLoader clazzLoader = webViewContext.getClassLoader();
- return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, true,
- clazzLoader);
+ Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "Class.forName()");
+ try {
+ return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, true,
+ clazzLoader);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW);
+ }
} catch (PackageManager.NameNotFoundException e) {
// If the package doesn't exist, then try loading the null WebView instead.
// If that succeeds, then this is a device without WebView support; if it fails then
diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index ccd0480..29a6a7d 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -53,6 +53,8 @@
private int mBasePadding;
private int mCheckMarkWidth;
+ private int mCheckMarkGravity = Gravity.END;
+
private boolean mNeedRequestlayout;
private static final int[] CHECKED_STATE_SET = {
@@ -83,15 +85,17 @@
}
mCheckMarkTintMode = Drawable.parseTintMode(a.getInt(
- R.styleable.CompoundButton_buttonTintMode, -1), mCheckMarkTintMode);
+ R.styleable.CheckedTextView_checkMarkTintMode, -1), mCheckMarkTintMode);
- if (a.hasValue(R.styleable.CompoundButton_buttonTint)) {
- mCheckMarkTintList = a.getColorStateList(R.styleable.CompoundButton_buttonTint);
+ if (a.hasValue(R.styleable.CheckedTextView_checkMarkTint)) {
+ mCheckMarkTintList = a.getColorStateList(R.styleable.CheckedTextView_checkMarkTint);
mHasCheckMarkTint = true;
applyCheckMarkTint();
}
+ mCheckMarkGravity = a.getInt(R.styleable.CheckedTextView_checkMarkGravity, Gravity.END);
+
boolean checked = a.getBoolean(R.styleable.CheckedTextView_checked, false);
setChecked(checked);
@@ -293,7 +297,7 @@
@Override
protected void internalSetPadding(int left, int top, int right, int bottom) {
super.internalSetPadding(left, top, right, bottom);
- setBasePadding(isLayoutRtl());
+ setBasePadding(isCheckMarkAtStart());
}
@Override
@@ -306,7 +310,7 @@
resetPaddingToInitialValues();
int newPadding = (mCheckMarkDrawable != null) ?
mCheckMarkWidth + mBasePadding : mBasePadding;
- if (isLayoutRtl()) {
+ if (isCheckMarkAtStart()) {
mNeedRequestlayout |= (mPaddingLeft != newPadding);
mPaddingLeft = newPadding;
} else {
@@ -319,14 +323,20 @@
}
}
- private void setBasePadding(boolean isLayoutRtl) {
- if (isLayoutRtl) {
+ private void setBasePadding(boolean checkmarkAtStart) {
+ if (checkmarkAtStart) {
mBasePadding = mPaddingLeft;
} else {
mBasePadding = mPaddingRight;
}
}
+ private boolean isCheckMarkAtStart() {
+ final int gravity = Gravity.getAbsoluteGravity(mCheckMarkGravity, getLayoutDirection());
+ final int hgrav = gravity & Gravity.HORIZONTAL_GRAVITY_MASK;
+ return hgrav == Gravity.LEFT;
+ }
+
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
@@ -347,13 +357,13 @@
break;
}
- final boolean isLayoutRtl = isLayoutRtl();
+ final boolean checkMarkAtStart = isCheckMarkAtStart();
final int width = getWidth();
final int top = y;
final int bottom = top + height;
final int left;
final int right;
- if (isLayoutRtl) {
+ if (checkMarkAtStart) {
left = mBasePadding;
right = left + mCheckMarkWidth;
} else {
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index d0a2eab..26c1f96 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -16,6 +16,7 @@
package android.widget;
+import android.annotation.Nullable;
import android.annotation.Widget;
import android.content.Context;
import android.content.res.Configuration;
@@ -123,7 +124,7 @@
final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DatePicker,
defStyleAttr, defStyleRes);
- int mode = a.getInt(R.styleable.DatePicker_datePickerMode, MODE_SPINNER);
+ final int mode = a.getInt(R.styleable.DatePicker_datePickerMode, MODE_SPINNER);
a.recycle();
switch (mode) {
@@ -149,20 +150,6 @@
}
/**
- * @hide
- */
- public void setShowDoneButton(boolean showDoneButton) {
- mDelegate.setShowDoneButton(showDoneButton);
- }
-
- /**
- * @hide
- */
- public void setDismissCallback(DatePickerDismissCallback callback) {
- mDelegate.setDismissCallback(callback);
- }
-
- /**
* Initialize the state. If the provided values designate an inconsistent
* date the values are normalized before updating the spinners.
*
@@ -259,6 +246,16 @@
mDelegate.setMaxDate(maxDate);
}
+ /**
+ * Sets the callback that indicates the current date is valid.
+ *
+ * @param callback the callback, may be null
+ * @hide
+ */
+ public void setValidationCallback(@Nullable ValidationCallback callback) {
+ mDelegate.setValidationCallback(callback);
+ }
+
@Override
public void setEnabled(boolean enabled) {
if (mDelegate.isEnabled() == enabled) {
@@ -402,8 +399,7 @@
void setSpinnersShown(boolean shown);
boolean getSpinnersShown();
- void setShowDoneButton(boolean showDoneButton);
- void setDismissCallback(DatePickerDismissCallback callback);
+ void setValidationCallback(ValidationCallback callback);
void onConfigurationChanged(Configuration newConfig);
@@ -431,7 +427,8 @@
protected Locale mCurrentLocale;
// Callbacks
- protected OnDateChangedListener mOnDateChangedListener;
+ protected OnDateChangedListener mOnDateChangedListener;
+ protected ValidationCallback mValidationCallback;
public AbstractDatePickerDelegate(DatePicker delegator, Context context) {
mDelegator = delegator;
@@ -447,15 +444,27 @@
}
mCurrentLocale = locale;
}
+
+ @Override
+ public void setValidationCallback(ValidationCallback callback) {
+ mValidationCallback = callback;
+ }
+
+ protected void onValidationChanged(boolean valid) {
+ if (mValidationCallback != null) {
+ mValidationCallback.onValidationChanged(valid);
+ }
+ }
}
/**
- * A callback interface for dismissing the DatePicker when included into a Dialog
+ * A callback interface for updating input validity when the date picker
+ * when included into a dialog.
*
* @hide
*/
- public static interface DatePickerDismissCallback {
- void dismiss(DatePicker view, boolean isCancel, int year, int month, int dayOfMonth);
+ public static interface ValidationCallback {
+ void onValidationChanged(boolean valid);
}
/**
@@ -775,16 +784,6 @@
}
@Override
- public void setShowDoneButton(boolean showDoneButton) {
- // Nothing to do
- }
-
- @Override
- public void setDismissCallback(DatePickerDismissCallback callback) {
- // Nothing to do
- }
-
- @Override
public void onConfigurationChanged(Configuration newConfig) {
setCurrentLocale(newConfig.locale);
}
diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java
index c0c76ac..f4a478a 100644
--- a/core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/core/java/android/widget/DatePickerCalendarDelegate.java
@@ -31,11 +31,9 @@
import android.text.format.DateUtils;
import android.util.AttributeSet;
import android.util.SparseArray;
-import android.util.StateSet;
import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.animation.AlphaAnimation;
@@ -83,8 +81,6 @@
private DayPickerView mDayPickerView;
private YearPickerView mYearPickerView;
- private ViewGroup mLayoutButtons;
-
private boolean mIsEnabled = true;
// Accessibility strings.
@@ -106,11 +102,6 @@
private Calendar mMinDate;
private Calendar mMaxDate;
- // For showing the done button when in a Dialog
- private Button mDoneButton;
- private boolean mShowDoneButton;
- private DatePicker.DatePickerDismissCallback mDismissCallback;
-
private HashSet<OnDateChangedListener> mListeners = new HashSet<OnDateChangedListener>();
public DatePickerCalendarDelegate(DatePicker delegator, Context context, AttributeSet attrs,
@@ -165,7 +156,7 @@
R.styleable.DatePicker_headerSelectedTextColor, defaultHighlightColor);
final int headerBackgroundColor = a.getColor(R.styleable.DatePicker_headerBackgroundColor,
Color.TRANSPARENT);
- mMonthAndDayLayout.setBackgroundColor(headerBackgroundColor);
+ mDateLayout.setBackgroundColor(headerBackgroundColor);
final int monthTextAppearanceResId = a.getResourceId(
R.styleable.DatePicker_headerMonthTextAppearance, -1);
@@ -221,20 +212,6 @@
animation2.setDuration(ANIMATION_DURATION);
mAnimator.setOutAnimation(animation2);
- mLayoutButtons = (ViewGroup) mainView.findViewById(R.id.layout_buttons);
- mDoneButton = (Button) mainView.findViewById(R.id.done);
- mDoneButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- tryVibrate();
- if (mDismissCallback != null) {
- mDismissCallback.dismiss(mDelegator, false, mCurrentDate.get(Calendar.YEAR),
- mCurrentDate.get(Calendar.MONTH),
- mCurrentDate.get(Calendar.DAY_OF_MONTH));
- }
- }
- });
-
updateDisplay(false);
setCurrentView(MONTH_AND_DAY_VIEW);
}
@@ -311,9 +288,9 @@
// Position the Year View at the correct location
if (viewIndices[YEAR_INDEX] == 0) {
- mDateLayout.addView(mHeaderYearTextView, 0);
- } else {
mDateLayout.addView(mHeaderYearTextView, 1);
+ } else {
+ mDateLayout.addView(mHeaderYearTextView, 2);
}
// Position Day and Month Views
@@ -545,21 +522,6 @@
}
@Override
- public void setShowDoneButton(boolean showDoneButton) {
- mShowDoneButton = showDoneButton;
- updateDoneButtonVisibility();
- }
-
- private void updateDoneButtonVisibility() {
- mLayoutButtons.setVisibility(mShowDoneButton ? View.VISIBLE : View.GONE);
- }
-
- @Override
- public void setDismissCallback(DatePicker.DatePickerDismissCallback callback) {
- mDismissCallback = callback;
- }
-
- @Override
public void onConfigurationChanged(Configuration newConfig) {
mYearFormat = new SimpleDateFormat("y", newConfig.locale);
mDayFormat = new SimpleDateFormat("d", newConfig.locale);
@@ -640,7 +602,6 @@
updatePickers();
setCurrentView(MONTH_AND_DAY_VIEW);
updateDisplay(true);
- updateDoneButtonEnableState();
}
// If the newly selected month / year does not contain the currently selected day number,
@@ -684,16 +645,6 @@
mCurrentDate.set(Calendar.DAY_OF_MONTH, day);
updatePickers();
updateDisplay(true);
- updateDoneButtonEnableState();
- }
-
- private void updateDoneButtonEnableState() {
- if (mShowDoneButton) {
- final boolean enabled = mCurrentDate.equals(mMinDate) ||
- mCurrentDate.equals(mMaxDate) ||
- (mCurrentDate.after(mMinDate) && mCurrentDate.before(mMaxDate));
- mDoneButton.setEnabled(enabled);
- }
}
private void updatePickers() {
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index b37ee06..3f5f045 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3158,6 +3158,7 @@
// Offset from touch position to mPosition
private float mTouchToWindowOffsetX, mTouchToWindowOffsetY;
protected int mHotspotX;
+ protected int mHorizontalGravity;
// Offsets the hotspot point up, so that cursor is not hidden by the finger when moving up
private float mTouchOffsetY;
// Where the touch position should be on the handle to ensure a maximum cursor visibility
@@ -3172,6 +3173,8 @@
private boolean mPositionHasChanged = true;
// Used to delay the appearance of the action popup window
private Runnable mActionPopupShower;
+ // Minimum touch target size for handles
+ private int mMinSize;
public HandleView(Drawable drawableLtr, Drawable drawableRtl) {
super(mTextView.getContext());
@@ -3184,10 +3187,12 @@
mDrawableLtr = drawableLtr;
mDrawableRtl = drawableRtl;
+ mMinSize = mTextView.getContext().getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.text_handle_min_size);
updateDrawable();
- final int handleHeight = mDrawable.getIntrinsicHeight();
+ final int handleHeight = getPreferredHeight();
mTouchOffsetY = -0.3f * handleHeight;
mIdealVerticalOffset = 0.7f * handleHeight;
}
@@ -3197,9 +3202,11 @@
final boolean isRtlCharAtOffset = mTextView.getLayout().isRtlCharAt(offset);
mDrawable = isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr;
mHotspotX = getHotspotX(mDrawable, isRtlCharAtOffset);
+ mHorizontalGravity = getHorizontalGravity(isRtlCharAtOffset);
}
protected abstract int getHotspotX(Drawable drawable, boolean isRtlRun);
+ protected abstract int getHorizontalGravity(boolean isRtlRun);
// Touch-up filter: number of previous positions remembered
private static final int HISTORY_SIZE = 5;
@@ -3244,7 +3251,15 @@
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- setMeasuredDimension(mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight());
+ setMeasuredDimension(getPreferredWidth(), getPreferredHeight());
+ }
+
+ private int getPreferredWidth() {
+ return Math.max(mDrawable.getIntrinsicWidth(), mMinSize);
+ }
+
+ private int getPreferredHeight() {
+ return Math.max(mDrawable.getIntrinsicHeight(), mMinSize);
}
public void show() {
@@ -3336,7 +3351,8 @@
}
final int line = layout.getLineForOffset(offset);
- mPositionX = (int) (layout.getPrimaryHorizontal(offset) - 0.5f - mHotspotX);
+ mPositionX = (int) (layout.getPrimaryHorizontal(offset) - 0.5f - mHotspotX -
+ getHorizontalOffset() + getCursorOffset());
mPositionY = layout.getLineBottom(line);
// Take TextView's padding and scroll into account.
@@ -3385,10 +3401,36 @@
@Override
protected void onDraw(Canvas c) {
- mDrawable.setBounds(0, 0, mRight - mLeft, mBottom - mTop);
+ final int drawWidth = mDrawable.getIntrinsicWidth();
+ final int left = getHorizontalOffset();
+
+ mDrawable.setBounds(left, 0, left + drawWidth, mDrawable.getIntrinsicHeight());
mDrawable.draw(c);
}
+ private int getHorizontalOffset() {
+ final int width = getPreferredWidth();
+ final int drawWidth = mDrawable.getIntrinsicWidth();
+ final int left;
+ switch (mHorizontalGravity) {
+ case Gravity.LEFT:
+ left = 0;
+ break;
+ default:
+ case Gravity.CENTER:
+ left = (width - drawWidth) / 2;
+ break;
+ case Gravity.RIGHT:
+ left = width - drawWidth;
+ break;
+ }
+ return left;
+ }
+
+ protected int getCursorOffset() {
+ return 0;
+ }
+
@Override
public boolean onTouchEvent(MotionEvent ev) {
switch (ev.getActionMasked()) {
@@ -3508,6 +3550,22 @@
}
@Override
+ protected int getHorizontalGravity(boolean isRtlRun) {
+ return Gravity.CENTER_HORIZONTAL;
+ }
+
+ @Override
+ protected int getCursorOffset() {
+ int offset = super.getCursorOffset();
+ final Drawable cursor = mCursorCount > 0 ? mCursorDrawable[0] : null;
+ if (cursor != null) {
+ cursor.getPadding(mTempRect);
+ offset += (cursor.getIntrinsicWidth() - mTempRect.left - mTempRect.right) / 2;
+ }
+ return offset;
+ }
+
+ @Override
public boolean onTouchEvent(MotionEvent ev) {
final boolean result = super.onTouchEvent(ev);
@@ -3594,6 +3652,11 @@
}
@Override
+ protected int getHorizontalGravity(boolean isRtlRun) {
+ return isRtlRun ? Gravity.RIGHT : Gravity.LEFT;
+ }
+
+ @Override
public int getCurrentCursorOffset() {
return mTextView.getSelectionStart();
}
@@ -3637,6 +3700,11 @@
}
@Override
+ protected int getHorizontalGravity(boolean isRtlRun) {
+ return isRtlRun ? Gravity.LEFT : Gravity.RIGHT;
+ }
+
+ @Override
public int getCurrentCursorOffset() {
return mTextView.getSelectionEnd();
}
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index c0961fd..06b7a93 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -79,6 +79,7 @@
// Positions for preview image and text.
private static final int OVERLAY_FLOATING = 0;
private static final int OVERLAY_AT_THUMB = 1;
+ private static final int OVERLAY_ABOVE_THUMB = 2;
// Indices for mPreviewResId.
private static final int PREVIEW_LEFT = 0;
@@ -189,8 +190,9 @@
/**
* Position for the preview image and text. One of:
* <ul>
- * <li>{@link #OVERLAY_AT_THUMB}
* <li>{@link #OVERLAY_FLOATING}
+ * <li>{@link #OVERLAY_AT_THUMB}
+ * <li>{@link #OVERLAY_ABOVE_THUMB}
* </ul>
*/
private int mOverlayPosition;
@@ -310,8 +312,10 @@
final int textMinSize = Math.max(0, mPreviewMinHeight);
mPrimaryText.setMinimumWidth(textMinSize);
mPrimaryText.setMinimumHeight(textMinSize);
+ mPrimaryText.setIncludeFontPadding(false);
mSecondaryText.setMinimumWidth(textMinSize);
mSecondaryText.setMinimumHeight(textMinSize);
+ mSecondaryText.setIncludeFontPadding(false);
refreshDrawablePressedState();
}
@@ -595,10 +599,10 @@
margins.right = mPreviewImage.getPaddingRight();
margins.bottom = mPreviewImage.getPaddingBottom();
- if (mOverlayPosition == OVERLAY_AT_THUMB) {
- measureViewToSide(v, mThumbImage, margins, out);
- } else {
+ if (mOverlayPosition == OVERLAY_FLOATING) {
measureFloating(v, margins, out);
+ } else {
+ measureViewToSide(v, mThumbImage, margins, out);
}
}
@@ -1147,11 +1151,23 @@
final float thumbMiddle = position * range + offset;
thumbImage.setTranslationY(thumbMiddle - thumbImage.getHeight() / 2);
- final float previewPos = mOverlayPosition == OVERLAY_AT_THUMB ? thumbMiddle : 0;
-
- // Center the preview on the thumb, constrained to the list bounds.
final View previewImage = mPreviewImage;
final float previewHalfHeight = previewImage.getHeight() / 2f;
+ final float previewPos;
+ switch (mOverlayPosition) {
+ case OVERLAY_AT_THUMB:
+ previewPos = thumbMiddle;
+ break;
+ case OVERLAY_ABOVE_THUMB:
+ previewPos = thumbMiddle - previewHalfHeight;
+ break;
+ case OVERLAY_FLOATING:
+ default:
+ previewPos = 0;
+ break;
+ }
+
+ // Center the preview on the thumb, constrained to the list bounds.
final float minP = top + previewHalfHeight;
final float maxP = bottom - previewHalfHeight;
final float previewMiddle = MathUtils.constrain(previewPos, minP, maxP);
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 9db1e05..1368cd3 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -1161,7 +1161,7 @@
if (recycleOnMeasure() && mRecycler.shouldRecycleViewType(
((LayoutParams) child.getLayoutParams()).viewType)) {
- mRecycler.addScrapView(child, -1);
+ mRecycler.addScrapView(child, 0);
}
}
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 3d2f67f..adca4cc 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -85,7 +85,7 @@
private static final int ALPHA_TRANSPARENT = 0;
// Alpha level of color for selector.
- private static final int ALPHA_SELECTOR = 255; // was 51
+ private static final int ALPHA_SELECTOR = 60; // was 51
// Alpha level of color for selected circle.
private static final int ALPHA_AMPM_SELECTED = ALPHA_SELECTOR;
@@ -105,7 +105,7 @@
private static final int CENTER_RADIUS = 2;
- private static final int[] STATE_SET_SELECTED = new int[] { R.attr.state_selected };
+ private static final int[] STATE_SET_SELECTED = new int[] {R.attr.state_selected};
private static int[] sSnapPrefer30sMap = new int[361];
@@ -337,6 +337,9 @@
// list doesn't have a state for selected, we'll use this color.
final int amPmSelectedColor = a.getColor(R.styleable.TimePicker_amPmSelectedBackgroundColor,
res.getColor(R.color.timepicker_default_ampm_selected_background_color_material));
+ amPmBackgroundColor = ColorStateList.addFirstIfMissing(
+ amPmBackgroundColor, R.attr.state_selected, amPmSelectedColor);
+
mAmPmSelectedColor = amPmBackgroundColor.getColorForState(
STATE_SET_SELECTED, amPmSelectedColor);
mAmPmUnselectedColor = amPmBackgroundColor.getDefaultColor();
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 4dd7e07..23f911c 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -1501,7 +1501,7 @@
mRules[ALIGN_PARENT_START] = 0;
}
- if (mRules[ALIGN_PARENT_RIGHT] == 0) {
+ if (mRules[ALIGN_PARENT_END] != 0) {
if (mRules[ALIGN_PARENT_RIGHT] == 0) {
// "right" rule is not defined but "end" rule is: use the "end" rule as the
// "right" rule
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 8aef304..05ff151 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -2656,7 +2656,7 @@
if (UserHandle.getUserId(applicationInfo.uid) != userId
|| !applicationInfo.packageName.equals(packageName)) {
try {
- Context context = application.getApplicationContext().createPackageContextAsUser(
+ Context context = application.getBaseContext().createPackageContextAsUser(
packageName, 0, new UserHandle(userId));
applicationInfo = context.getApplicationInfo();
} catch (NameNotFoundException nnfe) {
diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java
index ab6da7c..27763eb 100644
--- a/core/java/android/widget/SimpleMonthView.java
+++ b/core/java/android/widget/SimpleMonthView.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.res.ColorStateList;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Paint;
@@ -38,10 +39,9 @@
import com.android.internal.R;
import com.android.internal.widget.ExploreByTouchHelper;
-import java.security.InvalidParameterException;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Formatter;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -52,8 +52,8 @@
class SimpleMonthView extends View {
private static final String TAG = "SimpleMonthView";
- private static int DEFAULT_HEIGHT = 32;
- private static int MIN_HEIGHT = 10;
+ private static final int DEFAULT_HEIGHT = 32;
+ private static final int MIN_HEIGHT = 10;
private static final int DEFAULT_SELECTED_DAY = -1;
private static final int DEFAULT_WEEK_START = Calendar.SUNDAY;
@@ -63,17 +63,20 @@
private static final int SELECTED_CIRCLE_ALPHA = 60;
- private static int DAY_SEPARATOR_WIDTH = 1;
+ private static final int DAY_SEPARATOR_WIDTH = 1;
- private int mMiniDayNumberTextSize;
- private int mMonthLabelTextSize;
- private int mMonthDayLabelTextSize;
- private int mMonthHeaderSize;
- private int mDaySelectedCircleSize;
+ private final int mMiniDayNumberTextSize;
+ private final int mMonthLabelTextSize;
+ private final int mMonthDayLabelTextSize;
+ private final int mMonthHeaderSize;
+ private final int mDaySelectedCircleSize;
// used for scaling to the device density
private static float mScale = 0;
+ /** Single-letter (when available) formatter for the day of week label. */
+ private SimpleDateFormat mDayFormatter = new SimpleDateFormat("EEEEE", Locale.getDefault());
+
// affects the padding on the sides of this view
private int mPadding = 0;
@@ -183,6 +186,13 @@
initView();
}
+ @Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+
+ mDayFormatter = new SimpleDateFormat("EEEEE", newConfig.locale);
+ }
+
void setTextColor(ColorStateList colors) {
final Resources res = getContext().getResources();
@@ -289,7 +299,7 @@
drawDays(canvas);
}
- private static boolean isValidDay(int day) {
+ private static boolean isValidDayOfWeek(int day) {
return (day >= Time.SUNDAY && day <= Time.SATURDAY);
}
@@ -299,7 +309,7 @@
* default to no focus month if no value is passed in. The only required parameter is the
* week start.
*
- * @param selectedDay the selected day.
+ * @param selectedDay the selected day of the month, or -1 for no selection.
* @param month the month.
* @param year the year.
* @param weekStart which day the week should start on. {@link Time#SUNDAY} through
@@ -313,9 +323,7 @@
mRowHeight = MIN_HEIGHT;
}
- if (isValidDay(selectedDay)) {
- mSelectedDay = selectedDay;
- }
+ mSelectedDay = selectedDay;
if (month >= Calendar.JANUARY && month <= Calendar.DECEMBER) {
mMonth = month;
@@ -333,7 +341,7 @@
mCalendar.set(Calendar.DAY_OF_MONTH, 1);
mDayOfWeekStart = mCalendar.get(Calendar.DAY_OF_WEEK);
- if (isValidDay(weekStart)) {
+ if (isValidDayOfWeek(weekStart)) {
mWeekStart = weekStart;
} else {
mWeekStart = mCalendar.getFirstDayOfWeek();
@@ -424,22 +432,22 @@
}
private void drawMonthTitle(Canvas canvas) {
- int x = (mWidth + 2 * mPadding) / 2;
- int y = (mMonthHeaderSize - mMonthDayLabelTextSize) / 2 + (mMonthLabelTextSize / 3);
+ final float x = (mWidth + 2 * mPadding) / 2f;
+ final float y = (mMonthHeaderSize - mMonthDayLabelTextSize) / 2f;
canvas.drawText(getMonthAndYearString(), x, y, mMonthTitlePaint);
}
private void drawWeekDayLabels(Canvas canvas) {
- int y = mMonthHeaderSize - (mMonthDayLabelTextSize / 2);
- int dayWidthHalf = (mWidth - mPadding * 2) / (mNumDays * 2);
+ final int y = mMonthHeaderSize - (mMonthDayLabelTextSize / 2);
+ final int dayWidthHalf = (mWidth - mPadding * 2) / (mNumDays * 2);
for (int i = 0; i < mNumDays; i++) {
- int calendarDay = (i + mWeekStart) % mNumDays;
- int x = (2 * i + 1) * dayWidthHalf + mPadding;
+ final int calendarDay = (i + mWeekStart) % mNumDays;
mDayLabelCalendar.set(Calendar.DAY_OF_WEEK, calendarDay);
- canvas.drawText(mDayLabelCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.SHORT,
- Locale.getDefault()).toUpperCase(Locale.getDefault()), x, y,
- mMonthDayLabelPaint);
+
+ final String dayLabel = mDayFormatter.format(mDayLabelCalendar.getTime());
+ final int x = (2 * i + 1) * dayWidthHalf + mPadding;
+ canvas.drawText(dayLabel, x, y, mMonthDayLabelPaint);
}
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a536b2d..a82fa65 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -1320,8 +1320,8 @@
attrs, com.android.internal.R.styleable.View, defStyleAttr, defStyleRes);
boolean focusable = mMovement != null || getKeyListener() != null;
- boolean clickable = focusable;
- boolean longClickable = focusable;
+ boolean clickable = focusable || isClickable();
+ boolean longClickable = focusable || isLongClickable();
n = a.getIndexCount();
for (int i = 0; i < n; i++) {
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java
index c488666..85cf67b 100644
--- a/core/java/android/widget/TimePicker.java
+++ b/core/java/android/widget/TimePicker.java
@@ -16,6 +16,7 @@
package android.widget;
+import android.annotation.Nullable;
import android.annotation.Widget;
import android.content.Context;
import android.content.res.Configuration;
@@ -80,7 +81,7 @@
final TypedArray a = context.obtainStyledAttributes(
attrs, R.styleable.TimePicker, defStyleAttr, defStyleRes);
- int mode = a.getInt(R.styleable.TimePicker_timePickerMode, MODE_SPINNER);
+ final int mode = a.getInt(R.styleable.TimePicker_timePickerMode, MODE_SPINNER);
a.recycle();
switch (mode) {
@@ -149,6 +150,16 @@
mDelegate.setOnTimeChangedListener(onTimeChangedListener);
}
+ /**
+ * Sets the callback that indicates the current time is valid.
+ *
+ * @param callback the callback, may be null
+ * @hide
+ */
+ public void setValidationCallback(@Nullable ValidationCallback callback) {
+ mDelegate.setValidationCallback(callback);
+ }
+
@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
@@ -160,27 +171,6 @@
return mDelegate.isEnabled();
}
- /**
- * @hide
- */
- public void setShowDoneButton(boolean showDoneButton) {
- mDelegate.setShowDoneButton(showDoneButton);
- }
-
- /**
- * @hide
- */
- public boolean isShowDoneButton() {
- return mDelegate.isShowDoneButton();
- }
-
- /**
- * @hide
- */
- public void setDismissCallback(TimePickerDismissCallback callback) {
- mDelegate.setDismissCallback(callback);
- }
-
@Override
public int getBaseline() {
return mDelegate.getBaseline();
@@ -244,14 +234,11 @@
boolean is24HourView();
void setOnTimeChangedListener(OnTimeChangedListener onTimeChangedListener);
+ void setValidationCallback(ValidationCallback callback);
void setEnabled(boolean enabled);
boolean isEnabled();
- boolean isShowDoneButton();
- void setShowDoneButton(boolean showDoneButton);
- void setDismissCallback(TimePickerDismissCallback callback);
-
int getBaseline();
void onConfigurationChanged(Configuration newConfig);
@@ -266,12 +253,13 @@
}
/**
- * A callback interface for dismissing the TimePicker when included into a Dialog
+ * A callback interface for updating input validity when the TimePicker
+ * when included into a Dialog.
*
* @hide
*/
- public static interface TimePickerDismissCallback {
- void dismiss(TimePicker view, boolean isCancel, int hourOfDay, int minute);
+ public static interface ValidationCallback {
+ void onValidationChanged(boolean valid);
}
/**
@@ -288,7 +276,8 @@
protected Locale mCurrentLocale;
// Callbacks
- protected OnTimeChangedListener mOnTimeChangedListener;
+ protected OnTimeChangedListener mOnTimeChangedListener;
+ protected ValidationCallback mValidationCallback;
public AbstractTimePickerDelegate(TimePicker delegator, Context context) {
mDelegator = delegator;
@@ -304,5 +293,16 @@
}
mCurrentLocale = locale;
}
+
+ @Override
+ public void setValidationCallback(ValidationCallback callback) {
+ mValidationCallback = callback;
+ }
+
+ protected void onValidationChanged(boolean valid) {
+ if (mValidationCallback != null) {
+ mValidationCallback.onValidationChanged(valid);
+ }
+ }
}
}
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java
index 8102c4a..376e5b4 100644
--- a/core/java/android/widget/TimePickerClockDelegate.java
+++ b/core/java/android/widget/TimePickerClockDelegate.java
@@ -20,7 +20,6 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
-import android.graphics.Color;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.format.DateFormat;
@@ -35,7 +34,6 @@
import android.view.inputmethod.InputMethodManager;
import com.android.internal.R;
-import java.text.DateFormatSymbols;
import java.util.Calendar;
import java.util.Locale;
@@ -46,29 +44,20 @@
* A delegate implementing the basic TimePicker
*/
class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate {
-
private static final boolean DEFAULT_ENABLED_STATE = true;
-
private static final int HOURS_IN_HALF_DAY = 12;
// state
private boolean mIs24HourView;
-
private boolean mIsAm;
// ui components
private final NumberPicker mHourSpinner;
-
private final NumberPicker mMinuteSpinner;
-
private final NumberPicker mAmPmSpinner;
-
private final EditText mHourSpinnerInput;
-
private final EditText mMinuteSpinnerInput;
-
private final EditText mAmPmSpinnerInput;
-
private final TextView mDivider;
// Note that the legacy implementation of the TimePicker is
@@ -77,17 +66,10 @@
// accommodates these two cases to be backwards compatible.
private final Button mAmPmButton;
- // May be null if layout has no done button
- private final View mDoneButton;
- private boolean mShowDoneButton;
- private TimePicker.TimePickerDismissCallback mDismissCallback;
-
private final String[] mAmPmStrings;
private boolean mIsEnabled = DEFAULT_ENABLED_STATE;
-
private Calendar mTempCalendar;
-
private boolean mHourWithTwoDigit;
private char mHourFormat;
@@ -227,20 +209,6 @@
}
}
- mDoneButton = delegator.findViewById(R.id.done_button);
- mShowDoneButton = (mDoneButton != null);
- if (mShowDoneButton) {
- mDoneButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mDismissCallback != null) {
- mDismissCallback.dismiss(mDelegator, false, getCurrentHour(),
- getCurrentMinute());
- }
- }
- });
- }
-
getHourFormatData();
// update controls to initial state
@@ -265,8 +233,6 @@
if (mDelegator.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
mDelegator.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
}
-
- updateDoneButton();
}
private void getHourFormatData() {
@@ -432,30 +398,6 @@
}
@Override
- public void setShowDoneButton(boolean showDoneButton) {
- if (mDoneButton != null) {
- mShowDoneButton = showDoneButton;
- updateDoneButton();
- }
- }
-
- @Override
- public boolean isShowDoneButton() {
- return mShowDoneButton;
- }
-
- private void updateDoneButton() {
- if (mDoneButton != null) {
- mDoneButton.setVisibility(mShowDoneButton ? View.VISIBLE : View.GONE);
- }
- }
-
- @Override
- public void setDismissCallback(TimePicker.TimePickerDismissCallback callback) {
- mDismissCallback = callback;
- }
-
- @Override
public int getBaseline() {
return mHourSpinner.getBaseline();
}
@@ -467,8 +409,7 @@
@Override
public Parcelable onSaveInstanceState(Parcelable superState) {
- return new SavedState(superState, getCurrentHour(), getCurrentMinute(),
- isShowDoneButton());
+ return new SavedState(superState, getCurrentHour(), getCurrentMinute());
}
@Override
@@ -476,7 +417,6 @@
SavedState ss = (SavedState) state;
setCurrentHour(ss.getHour());
setCurrentMinute(ss.getMinute());
- setShowDoneButton(ss.isShowDoneButton());
}
@Override
@@ -632,25 +572,19 @@
* Used to save / restore state of time picker
*/
private static class SavedState extends View.BaseSavedState {
-
private final int mHour;
-
private final int mMinute;
- private final boolean mShowDoneButton;
-
- private SavedState(Parcelable superState, int hour, int minute, boolean showDoneButton) {
+ private SavedState(Parcelable superState, int hour, int minute) {
super(superState);
mHour = hour;
mMinute = minute;
- mShowDoneButton = showDoneButton;
}
private SavedState(Parcel in) {
super(in);
mHour = in.readInt();
mMinute = in.readInt();
- mShowDoneButton = (in.readInt() == 1);
}
public int getHour() {
@@ -661,16 +595,11 @@
return mMinute;
}
- public boolean isShowDoneButton() {
- return mShowDoneButton;
- }
-
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
dest.writeInt(mHour);
dest.writeInt(mMinute);
- dest.writeInt(mShowDoneButton ? 1 : 0);
}
@SuppressWarnings({"unused", "hiding"})
diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java
index 523965c..9a50250 100644
--- a/core/java/android/widget/TimePickerSpinnerDelegate.java
+++ b/core/java/android/widget/TimePickerSpinnerDelegate.java
@@ -43,7 +43,6 @@
import com.android.internal.R;
-import java.text.DateFormatSymbols;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Locale;
@@ -86,8 +85,6 @@
private RadialTimePickerView mRadialTimePickerView;
private TextView mSeparatorView;
- private ViewGroup mLayoutButtons;
-
private String mAmText;
private String mPmText;
@@ -101,16 +98,12 @@
private String mDoublePlaceholderText;
private String mDeletedKeyFormat;
private boolean mInKbMode;
+ private boolean mIsTimeValid = true;
private ArrayList<Integer> mTypedTimes = new ArrayList<Integer>();
private Node mLegalTimesTree;
private int mAmKeyCode;
private int mPmKeyCode;
- // For showing the done button when in a Dialog
- private Button mDoneButton;
- private boolean mShowDoneButton;
- private TimePicker.TimePickerDismissCallback mDismissCallback;
-
// Accessibility strings.
private String mHourPickerDescription;
private String mSelectHours;
@@ -146,7 +139,6 @@
mSeparatorView = (TextView) mainView.findViewById(R.id.separator);
mMinuteView = (TextView) mainView.findViewById(R.id.minutes);
mAmPmTextView = (TextView) mainView.findViewById(R.id.ampm_label);
- mLayoutButtons = (ViewGroup) mainView.findViewById(R.id.layout_buttons);
// Set up text appearances from style.
final int headerTimeTextAppearance = a.getResourceId(
@@ -174,7 +166,6 @@
final int headerBackgroundColor = a.getColor(
R.styleable.TimePicker_headerBackgroundColor, Color.TRANSPARENT);
if (headerBackgroundColor != Color.TRANSPARENT) {
- mLayoutButtons.setBackgroundColor(headerBackgroundColor);
mainView.findViewById(R.id.time_header).setBackgroundColor(headerBackgroundColor);
}
@@ -182,7 +173,6 @@
mRadialTimePickerView = (RadialTimePickerView) mainView.findViewById(
R.id.radial_picker);
- mDoneButton = (Button) mainView.findViewById(R.id.done_button);
setupListeners();
@@ -199,16 +189,14 @@
final Calendar calendar = Calendar.getInstance(mCurrentLocale);
final int currentHour = calendar.get(Calendar.HOUR_OF_DAY);
final int currentMinute = calendar.get(Calendar.MINUTE);
- initialize(currentHour, currentMinute, false /* 12h */, HOUR_INDEX, false);
+ initialize(currentHour, currentMinute, false /* 12h */, HOUR_INDEX);
}
- private void initialize(int hourOfDay, int minute, boolean is24HourView, int index,
- boolean showDoneButton) {
+ private void initialize(int hourOfDay, int minute, boolean is24HourView, int index) {
mInitialHourOfDay = hourOfDay;
mInitialMinute = minute;
mIs24HourView = is24HourView;
mInKbMode = false;
- mShowDoneButton = showDoneButton;
updateUI(index);
}
@@ -236,21 +224,6 @@
tryVibrate();
}
});
- mDoneButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mInKbMode && isTypedTimeFullyLegal()) {
- finishKbMode(false);
- } else {
- tryVibrate();
- }
- if (mDismissCallback != null) {
- mDismissCallback.dismiss(mDelegator, false, getCurrentHour(),
- getCurrentMinute());
- }
- }
- });
- mDoneButton.setOnKeyListener(keyboardListener);
}
private void updateUI(int index) {
@@ -258,8 +231,6 @@
updateRadialPicker(index);
// Enable or disable the AM/PM view.
updateHeaderAmPm();
- // Show or hide Done button
- updateDoneButton();
// Update Hour and Minutes
updateHeaderHour(mInitialHourOfDay, true);
// Update time separator
@@ -336,10 +307,6 @@
}
}
- private void updateDoneButton() {
- mLayoutButtons.setVisibility(mShowDoneButton ? View.VISIBLE : View.GONE);
- }
-
/**
* Set the current hour.
*/
@@ -447,17 +414,6 @@
}
@Override
- public void setShowDoneButton(boolean showDoneButton) {
- mShowDoneButton = showDoneButton;
- updateDoneButton();
- }
-
- @Override
- public void setDismissCallback(TimePicker.TimePickerDismissCallback callback) {
- mDismissCallback = callback;
- }
-
- @Override
public int getBaseline() {
// does not support baseline alignment
return -1;
@@ -471,8 +427,7 @@
@Override
public Parcelable onSaveInstanceState(Parcelable superState) {
return new SavedState(superState, getCurrentHour(), getCurrentMinute(),
- is24HourView(), inKbMode(), getTypedTimes(), getCurrentItemShowing(),
- isShowDoneButton());
+ is24HourView(), inKbMode(), getTypedTimes(), getCurrentItemShowing());
}
@Override
@@ -480,8 +435,7 @@
SavedState ss = (SavedState) state;
setInKbMode(ss.inKbMode());
setTypedTimes(ss.getTypesTimes());
- initialize(ss.getHour(), ss.getMinute(), ss.is24HourMode(), ss.getCurrentItemShowing(),
- ss.isShowDoneButton());
+ initialize(ss.getHour(), ss.getMinute(), ss.is24HourMode(), ss.getCurrentItemShowing());
mRadialTimePickerView.invalidate();
if (mInKbMode) {
tryStartingKbMode(-1);
@@ -560,11 +514,6 @@
return mRadialTimePickerView.getCurrentItemShowing();
}
- @Override
- public boolean isShowDoneButton() {
- return mShowDoneButton;
- }
-
/**
* Propagate the time change
*/
@@ -587,11 +536,10 @@
private final boolean mInKbMode;
private final ArrayList<Integer> mTypedTimes;
private final int mCurrentItemShowing;
- private final boolean mShowDoneButton;
private SavedState(Parcelable superState, int hour, int minute, boolean is24HourMode,
boolean isKbMode, ArrayList<Integer> typedTimes,
- int currentItemShowing, boolean showDoneButton) {
+ int currentItemShowing) {
super(superState);
mHour = hour;
mMinute = minute;
@@ -599,7 +547,6 @@
mInKbMode = isKbMode;
mTypedTimes = typedTimes;
mCurrentItemShowing = currentItemShowing;
- mShowDoneButton = showDoneButton;
}
private SavedState(Parcel in) {
@@ -610,7 +557,6 @@
mInKbMode = (in.readInt() == 1);
mTypedTimes = in.readArrayList(getClass().getClassLoader());
mCurrentItemShowing = in.readInt();
- mShowDoneButton = (in.readInt() == 1);
}
public int getHour() {
@@ -637,10 +583,6 @@
return mCurrentItemShowing;
}
- public boolean isShowDoneButton() {
- return mShowDoneButton;
- }
-
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
@@ -650,7 +592,6 @@
dest.writeInt(mInKbMode ? 1 : 0);
dest.writeList(mTypedTimes);
dest.writeInt(mCurrentItemShowing);
- dest.writeInt(mShowDoneButton ? 1 : 0);
}
@SuppressWarnings({"unused", "hiding"})
@@ -852,12 +793,7 @@
* @return true if the key was successfully processed, false otherwise.
*/
private boolean processKeyUp(int keyCode) {
- if (keyCode == KeyEvent.KEYCODE_ESCAPE || keyCode == KeyEvent.KEYCODE_BACK) {
- if (mDismissCallback != null) {
- mDismissCallback.dismiss(mDelegator, true, getCurrentHour(), getCurrentMinute());
- }
- return true;
- } else if (keyCode == KeyEvent.KEYCODE_TAB) {
+ if (keyCode == KeyEvent.KEYCODE_ESCAPE || keyCode == KeyEvent.KEYCODE_TAB) {
if(mInKbMode) {
if (isTypedTimeFullyLegal()) {
finishKbMode(true);
@@ -876,9 +812,6 @@
mRadialTimePickerView.getCurrentHour(),
mRadialTimePickerView.getCurrentMinute());
}
- if (mDismissCallback != null) {
- mDismissCallback.dismiss(mDelegator, false, getCurrentHour(), getCurrentMinute());
- }
return true;
} else if (keyCode == KeyEvent.KEYCODE_DEL) {
if (mInKbMode) {
@@ -933,7 +866,7 @@
private void tryStartingKbMode(int keyCode) {
if (keyCode == -1 || addKeyIfLegal(keyCode)) {
mInKbMode = true;
- mDoneButton.setEnabled(false);
+ onValidationChanged(false);
updateDisplay(false);
mRadialTimePickerView.setInputEnabled(false);
}
@@ -961,7 +894,7 @@
mTypedTimes.add(mTypedTimes.size() - 1, KeyEvent.KEYCODE_0);
mTypedTimes.add(mTypedTimes.size() - 1, KeyEvent.KEYCODE_0);
}
- mDoneButton.setEnabled(true);
+ onValidationChanged(true);
}
return true;
@@ -1002,7 +935,7 @@
private int deleteLastTypedKey() {
int deleted = mTypedTimes.remove(mTypedTimes.size() - 1);
if (!isTypedTimeFullyLegal()) {
- mDoneButton.setEnabled(false);
+ onValidationChanged(false);
}
return deleted;
}
@@ -1046,7 +979,7 @@
updateAmPmDisplay(hour < 12 ? AM : PM);
}
setCurrentItemShowing(mRadialTimePickerView.getCurrentItemShowing(), true, true, true);
- mDoneButton.setEnabled(true);
+ onValidationChanged(true);
} else {
boolean[] enteredZeros = {false, false};
int[] values = getEnteredTime(enteredZeros);
diff --git a/core/java/android/widget/YearPickerView.java b/core/java/android/widget/YearPickerView.java
index b67fa55..94c21dc 100644
--- a/core/java/android/widget/YearPickerView.java
+++ b/core/java/android/widget/YearPickerView.java
@@ -45,7 +45,7 @@
}
public YearPickerView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
+ this(context, attrs, R.attr.listViewStyle);
}
public YearPickerView(Context context, AttributeSet attrs, int defStyleAttr) {
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index cd922a1..5267811 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -60,6 +60,7 @@
initialIntents[i] = in;
}
}
+ setSafeForwardingMode(true);
super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents,
null, false);
}
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl
index 7a3ffdf..81ea191 100644
--- a/core/java/com/android/internal/app/IMediaContainerService.aidl
+++ b/core/java/com/android/internal/app/IMediaContainerService.aidl
@@ -25,10 +25,7 @@
boolean isExternal, boolean isForwardLocked, String abiOverride);
int copyPackage(String packagePath, in IParcelFileDescriptorFactory target);
- PackageInfoLite getMinimalPackageInfo(String packagePath, int flags, long threshold,
- String abiOverride);
- boolean checkInternalFreeStorage(String packagePath, boolean isForwardLocked, long threshold);
- boolean checkExternalFreeStorage(String packagePath, boolean isForwardLocked, String abiOverride);
+ PackageInfoLite getMinimalPackageInfo(String packagePath, int flags, String abiOverride);
ObbInfo getObbInfo(String filename);
long calculateDirectorySize(String directory);
/** Return file system stats: [0] is total bytes, [1] is available bytes */
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index af38b3e..d9493752 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -76,17 +76,19 @@
}
Intent newIntent = new Intent(intentReceived);
newIntent.setComponent(null);
+ // Apps should not be allowed to target a specific package in the target user.
+ newIntent.setPackage(null);
newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
|Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
int callingUserId = getUserId();
IPackageManager ipm = AppGlobals.getPackageManager();
String resolvedType = newIntent.resolveTypeIfNeeded(getContentResolver());
boolean canForward = false;
+ Intent selector = newIntent.getSelector();
+ if (selector == null) {
+ selector = newIntent;
+ }
try {
- Intent selector = newIntent.getSelector();
- if (selector == null) {
- selector = newIntent;
- }
canForward = ipm.canForwardTo(selector, resolvedType, callingUserId,
userDest.getIdentifier());
} catch (RemoteException e) {
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index b1727fa..61b4567 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -17,10 +17,14 @@
package com.android.internal.app;
import android.app.Activity;
+import android.app.ActivityThread;
import android.app.usage.UsageStats;
import android.app.usage.UsageStatsManager;
import android.os.AsyncTask;
+import android.provider.Settings;
+import android.text.TextUtils;
import android.util.ArrayMap;
+import android.util.Slog;
import android.widget.AbsListView;
import android.widget.GridView;
import com.android.internal.R;
@@ -83,6 +87,7 @@
private int mLaunchedFromUid;
private ResolveListAdapter mAdapter;
private PackageManager mPm;
+ private boolean mSafeForwardingMode;
private boolean mAlwaysUseOption;
private boolean mShowExtended;
private GridView mGridView;
@@ -175,6 +180,8 @@
titleResource = 0;
}
+ setSafeForwardingMode(true);
+
onCreate(savedInstanceState, intent,
titleResource != 0 ? getResources().getText(titleResource) : null, titleResource,
null, null, true);
@@ -247,7 +254,7 @@
resizeGrid();
} else if (count == 1) {
- startActivity(mAdapter.intentForPosition(0, false));
+ safelyStartActivity(mAdapter.intentForPosition(0, false));
mPackageMonitor.unregister();
mRegistered = false;
finish();
@@ -272,12 +279,15 @@
});
}
- final TextView titleView = (TextView) findViewById(R.id.title);
- if (titleView != null) {
- if (title == null) {
- title = getTitleForAction(intent.getAction(), defaultTitleRes);
+ if (title == null) {
+ title = getTitleForAction(intent.getAction(), defaultTitleRes);
+ }
+ if (!TextUtils.isEmpty(title)) {
+ final TextView titleView = (TextView) findViewById(R.id.title);
+ if (titleView != null) {
+ titleView.setText(title);
}
- titleView.setText(title);
+ setTitle(title);
}
final ImageView iconView = (ImageView) findViewById(R.id.icon);
@@ -303,6 +313,22 @@
}
}
+ /**
+ * Turn on launch mode that is safe to use when forwarding intents received from
+ * applications and running in system processes. This mode uses Activity.startActivityAsCaller
+ * instead of the normal Activity.startActivity for launching the activity selected
+ * by the user.
+ *
+ * <p>This mode is set to true by default if the activity is initialized through
+ * {@link #onCreate(android.os.Bundle)}. If a subclass calls one of the other onCreate
+ * methods, it is set to false by default. You must set it before calling one of the
+ * more detailed onCreate methods, so that it will be set correctly in the case where
+ * there is only one intent to resolve and it is thus started immediately.</p>
+ */
+ public void setSafeForwardingMode(boolean safeForwarding) {
+ mSafeForwardingMode = safeForwarding;
+ }
+
protected CharSequence getTitleForAction(String action, int defaultTitleRes) {
final ActionTitle title = ActionTitle.forAction(action);
final boolean named = mAdapter.hasFilteredItem();
@@ -605,12 +631,33 @@
}
if (intent != null) {
+ safelyStartActivity(intent);
+ }
+ }
+
+ public void safelyStartActivity(Intent intent) {
+ if (!mSafeForwardingMode) {
startActivity(intent);
+ return;
+ }
+ try {
+ startActivityAsCaller(intent, null);
+ } catch (RuntimeException e) {
+ String launchedFromPackage;
+ try {
+ launchedFromPackage = ActivityManagerNative.getDefault().getLaunchedFromPackage(
+ getActivityToken());
+ } catch (RemoteException e2) {
+ launchedFromPackage = "??";
+ }
+ Slog.wtf(TAG, "Unable to launch as uid " + mLaunchedFromUid
+ + " package " + launchedFromPackage + ", while running in "
+ + ActivityThread.currentProcessName(), e);
}
}
void showAppDetails(ResolveInfo ri) {
- Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS")
+ Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
startActivity(in);
diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java
index 96d7192..13eb182 100644
--- a/core/java/com/android/internal/app/ToolbarActionBar.java
+++ b/core/java/com/android/internal/app/ToolbarActionBar.java
@@ -29,6 +29,7 @@
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
+import android.view.WindowCallbackWrapper;
import android.widget.SpinnerAdapter;
import android.widget.Toolbar;
import com.android.internal.view.menu.MenuBuilder;
@@ -40,6 +41,7 @@
public class ToolbarActionBar extends ActionBar {
private Toolbar mToolbar;
private DecorToolbar mDecorToolbar;
+ private boolean mToolbarMenuPrepared;
private Window.Callback mWindowCallback;
private boolean mLastMenuVisibility;
@@ -64,12 +66,16 @@
public ToolbarActionBar(Toolbar toolbar, CharSequence title, Window.Callback windowCallback) {
mToolbar = toolbar;
mDecorToolbar = new ToolbarWidgetWrapper(toolbar, false);
- mWindowCallback = windowCallback;
+ mWindowCallback = new ToolbarCallbackWrapper(windowCallback);
mDecorToolbar.setWindowCallback(mWindowCallback);
toolbar.setOnMenuItemClickListener(mMenuClicker);
mDecorToolbar.setWindowTitle(title);
}
+ public Window.Callback getWrappedWindowCallback() {
+ return mWindowCallback;
+ }
+
@Override
public void setCustomView(View view) {
setCustomView(view, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
@@ -465,4 +471,20 @@
mMenuVisibilityListeners.get(i).onMenuVisibilityChanged(isVisible);
}
}
+
+ private class ToolbarCallbackWrapper extends WindowCallbackWrapper {
+ public ToolbarCallbackWrapper(Window.Callback wrapped) {
+ super(wrapped);
+ }
+
+ @Override
+ public boolean onPreparePanel(int featureId, View view, Menu menu) {
+ final boolean result = super.onPreparePanel(featureId, view, menu);
+ if (result && !mToolbarMenuPrepared) {
+ mDecorToolbar.setMenuPrepared();
+ mToolbarMenuPrepared = true;
+ }
+ return result;
+ }
+ }
}
diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java
index d76d0d4..179d5e8 100644
--- a/core/java/com/android/internal/content/NativeLibraryHelper.java
+++ b/core/java/com/android/internal/content/NativeLibraryHelper.java
@@ -19,15 +19,25 @@
import static android.content.pm.PackageManager.INSTALL_FAILED_NO_MATCHING_ABIS;
import static android.content.pm.PackageManager.INSTALL_SUCCEEDED;
import static android.content.pm.PackageManager.NO_NATIVE_LIBRARIES;
+import static android.system.OsConstants.S_IRGRP;
+import static android.system.OsConstants.S_IROTH;
+import static android.system.OsConstants.S_IRWXU;
+import static android.system.OsConstants.S_IXGRP;
+import static android.system.OsConstants.S_IXOTH;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
import android.content.pm.PackageParser.Package;
import android.content.pm.PackageParser.PackageLite;
import android.content.pm.PackageParser.PackageParserException;
+import android.os.Build;
+import android.os.SELinux;
+import android.system.ErrnoException;
+import android.system.Os;
import android.util.Slog;
import dalvik.system.CloseGuard;
+import dalvik.system.VMRuntime;
import java.io.Closeable;
import java.io.File;
@@ -44,6 +54,10 @@
private static final boolean DEBUG_NATIVE = false;
+ // Special value for {@code PackageParser.Package#cpuAbiOverride} to indicate
+ // that the cpuAbiOverride must be clear.
+ public static final String CLEAR_ABI_OVERRIDE = "-";
+
/**
* A handle to an opened package, consisting of one or more APKs. Used as
* input to the various NativeLibraryHelper methods. Allows us to scan and
@@ -126,27 +140,17 @@
private static native long nativeSumNativeBinaries(long handle, String cpuAbi);
- /**
- * Sums the size of native binaries in an APK for a given ABI.
- *
- * @return size of all native binary files in bytes
- */
- public static long sumNativeBinariesLI(Handle handle, String[] abis) {
+ private native static int nativeCopyNativeBinaries(long handle,
+ String sharedLibraryPath, String abiToCopy);
+
+ private static long sumNativeBinaries(Handle handle, String abi) {
long sum = 0;
for (long apkHandle : handle.apkHandles) {
- // NOTE: For a given APK handle, we parse the central directory precisely
- // once, but prefix matching of entries requires a CD traversal, which can
- // take a while (even if it needs no additional I/O).
- for (String abi : abis) {
- sum += nativeSumNativeBinaries(apkHandle, abi);
- }
+ sum += nativeSumNativeBinaries(apkHandle, abi);
}
return sum;
}
- private native static int nativeCopyNativeBinaries(long handle,
- String sharedLibraryPath, String abiToCopy);
-
/**
* Copies native binaries to a shared library directory.
*
@@ -244,9 +248,171 @@
}
}
+ private static void createNativeLibrarySubdir(File path) throws IOException {
+ if (!path.isDirectory()) {
+ path.delete();
+
+ if (!path.mkdir()) {
+ throw new IOException("Cannot create " + path.getPath());
+ }
+
+ try {
+ Os.chmod(path.getPath(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+ } catch (ErrnoException e) {
+ throw new IOException("Cannot chmod native library directory "
+ + path.getPath(), e);
+ }
+ } else if (!SELinux.restorecon(path)) {
+ throw new IOException("Cannot set SELinux context for " + path.getPath());
+ }
+ }
+
+ private static long sumNativeBinaries(Handle handle, String[] abiList) {
+ int abi = findSupportedAbi(handle, abiList);
+ if (abi >= 0) {
+ return sumNativeBinaries(handle, abiList[abi]);
+ } else {
+ return 0;
+ }
+ }
+
+ public static int copyNativeBinariesIfNeededLI(Handle handle, File libraryRoot,
+ String[] abiList, boolean useIsaSubdir) throws IOException {
+ createNativeLibrarySubdir(libraryRoot);
+
+ /*
+ * If this is an internal application or our nativeLibraryPath points to
+ * the app-lib directory, unpack the libraries if necessary.
+ */
+ int abi = findSupportedAbi(handle, abiList);
+ if (abi >= 0) {
+ /*
+ * If we have a matching instruction set, construct a subdir under the native
+ * library root that corresponds to this instruction set.
+ */
+ final String instructionSet = VMRuntime.getInstructionSet(abiList[abi]);
+ final File subDir;
+ if (useIsaSubdir) {
+ final File isaSubdir = new File(libraryRoot, instructionSet);
+ createNativeLibrarySubdir(isaSubdir);
+ subDir = isaSubdir;
+ } else {
+ subDir = libraryRoot;
+ }
+
+ int copyRet = copyNativeBinariesIfNeededLI(handle, subDir, abiList[abi]);
+ if (copyRet != PackageManager.INSTALL_SUCCEEDED) {
+ return copyRet;
+ }
+ }
+
+ return abi;
+ }
+
+ public static int copyNativeBinariesIfNeededLI(Handle handle, File libraryRoot,
+ String abiOverride, boolean multiArch) {
+ try {
+ if (multiArch) {
+ // Warn if we've set an abiOverride for multi-lib packages..
+ // By definition, we need to copy both 32 and 64 bit libraries for
+ // such packages.
+ if (abiOverride != null && !CLEAR_ABI_OVERRIDE.equals(abiOverride)) {
+ Slog.w(TAG, "Ignoring abiOverride for multi arch application.");
+ }
+
+ int copyRet = PackageManager.NO_NATIVE_LIBRARIES;
+ if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {
+ copyRet = copyNativeBinariesIfNeededLI(handle, libraryRoot,
+ Build.SUPPORTED_32_BIT_ABIS, true /* use isa specific subdirs */);
+ if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES &&
+ copyRet != PackageManager.INSTALL_FAILED_NO_MATCHING_ABIS) {
+ Slog.w(TAG, "Failure copying 32 bit native libraries; copyRet=" +copyRet);
+ return copyRet;
+ }
+ }
+
+ if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {
+ copyRet = copyNativeBinariesIfNeededLI(handle, libraryRoot,
+ Build.SUPPORTED_64_BIT_ABIS, true /* use isa specific subdirs */);
+ if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES &&
+ copyRet != PackageManager.INSTALL_FAILED_NO_MATCHING_ABIS) {
+ Slog.w(TAG, "Failure copying 64 bit native libraries; copyRet=" +copyRet);
+ return copyRet;
+ }
+ }
+ } else {
+ String cpuAbiOverride = null;
+ if (CLEAR_ABI_OVERRIDE.equals(abiOverride)) {
+ cpuAbiOverride = null;
+ } else if (abiOverride != null) {
+ cpuAbiOverride = abiOverride;
+ }
+
+ String[] abiList = (cpuAbiOverride != null) ?
+ new String[] { cpuAbiOverride } : Build.SUPPORTED_ABIS;
+ if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && cpuAbiOverride == null &&
+ hasRenderscriptBitcode(handle)) {
+ abiList = Build.SUPPORTED_32_BIT_ABIS;
+ }
+
+ int copyRet = copyNativeBinariesIfNeededLI(handle, libraryRoot, abiList,
+ true /* use isa specific subdirs */);
+ if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES) {
+ Slog.w(TAG, "Failure copying native libraries [errorCode=" + copyRet + "]");
+ return copyRet;
+ }
+ }
+
+ return PackageManager.INSTALL_SUCCEEDED;
+ } catch (IOException e) {
+ Slog.e(TAG, "Copying native libraries failed", e);
+ return PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
+ }
+ }
+
+ public static long sumNativeBinaries(Handle handle, String abiOverride, boolean multiArch)
+ throws IOException {
+ long sum = 0;
+ if (multiArch) {
+ // Warn if we've set an abiOverride for multi-lib packages..
+ // By definition, we need to copy both 32 and 64 bit libraries for
+ // such packages.
+ if (abiOverride != null && !CLEAR_ABI_OVERRIDE.equals(abiOverride)) {
+ Slog.w(TAG, "Ignoring abiOverride for multi arch application.");
+ }
+
+ if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {
+ sum += sumNativeBinaries(handle, Build.SUPPORTED_32_BIT_ABIS);
+ }
+
+ if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {
+ sum += sumNativeBinaries(handle, Build.SUPPORTED_64_BIT_ABIS);
+ }
+ } else {
+ String cpuAbiOverride = null;
+ if (CLEAR_ABI_OVERRIDE.equals(abiOverride)) {
+ cpuAbiOverride = null;
+ } else if (abiOverride != null) {
+ cpuAbiOverride = abiOverride;
+ }
+
+ String[] abiList = (cpuAbiOverride != null) ?
+ new String[] { cpuAbiOverride } : Build.SUPPORTED_ABIS;
+ if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && cpuAbiOverride == null &&
+ hasRenderscriptBitcode(handle)) {
+ abiList = Build.SUPPORTED_32_BIT_ABIS;
+ }
+
+ sum += sumNativeBinaries(handle, abiList);
+ }
+ return sum;
+ }
+
// We don't care about the other return values for now.
private static final int BITCODE_PRESENT = 1;
+ private static native int hasRenderscriptBitcode(long apkHandle);
+
public static boolean hasRenderscriptBitcode(Handle handle) throws IOException {
for (long apkHandle : handle.apkHandles) {
final int res = hasRenderscriptBitcode(apkHandle);
@@ -258,6 +424,4 @@
}
return false;
}
-
- private static native int hasRenderscriptBitcode(long apkHandle);
}
diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java
index eff6684..a529cc3 100644
--- a/core/java/com/android/internal/content/PackageHelper.java
+++ b/core/java/com/android/internal/content/PackageHelper.java
@@ -16,14 +16,25 @@
package com.android.internal.content;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Environment;
+import android.os.Environment.UserEnvironment;
import android.os.FileUtils;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserHandle;
import android.os.storage.IMountService;
+import android.os.storage.StorageManager;
import android.os.storage.StorageResultCode;
import android.util.Log;
+import libcore.io.IoUtils;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -33,8 +44,6 @@
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
-import libcore.io.IoUtils;
-
/**
* Constants used internally between the PackageManager
* and media container service transports.
@@ -210,7 +219,7 @@
/**
* Extract public files for the single given APK.
*/
- public static int extractPublicFiles(String apkPath, File publicZipFile)
+ public static long extractPublicFiles(File apkFile, File publicZipFile)
throws IOException {
final FileOutputStream fstr;
final ZipOutputStream publicZipOutStream;
@@ -221,12 +230,13 @@
} else {
fstr = new FileOutputStream(publicZipFile);
publicZipOutStream = new ZipOutputStream(fstr);
+ Log.d(TAG, "Extracting " + apkFile + " to " + publicZipFile);
}
- int size = 0;
+ long size = 0L;
try {
- final ZipFile privateZip = new ZipFile(apkPath);
+ final ZipFile privateZip = new ZipFile(apkFile.getAbsolutePath());
try {
// Copy manifest, resources.arsc and res directory to public zip
for (final ZipEntry zipEntry : Collections.list(privateZip.entries())) {
@@ -298,4 +308,103 @@
}
return false;
}
+
+ /**
+ * Given a requested {@link PackageInfo#installLocation} and calculated
+ * install size, pick the actual location to install the app.
+ */
+ public static int resolveInstallLocation(Context context, String packageName,
+ int installLocation, long sizeBytes, int installFlags) {
+ ApplicationInfo existingInfo = null;
+ try {
+ existingInfo = context.getPackageManager().getApplicationInfo(packageName,
+ PackageManager.GET_UNINSTALLED_PACKAGES);
+ } catch (NameNotFoundException ignored) {
+ }
+
+ final int prefer;
+ final boolean checkBoth;
+ if ((installFlags & PackageManager.INSTALL_INTERNAL) != 0) {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ } else if ((installFlags & PackageManager.INSTALL_EXTERNAL) != 0) {
+ prefer = RECOMMEND_INSTALL_EXTERNAL;
+ checkBoth = false;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
+ prefer = RECOMMEND_INSTALL_EXTERNAL;
+ checkBoth = true;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
+ // When app is already installed, prefer same medium
+ if (existingInfo != null) {
+ if ((existingInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ prefer = RECOMMEND_INSTALL_EXTERNAL;
+ } else {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ }
+ } else {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ }
+ checkBoth = true;
+ } else {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ }
+
+ final boolean emulated = Environment.isExternalStorageEmulated();
+ final StorageManager storage = StorageManager.from(context);
+
+ boolean fitsOnInternal = false;
+ if (checkBoth || prefer == RECOMMEND_INSTALL_INTERNAL) {
+ final File target = Environment.getDataDirectory();
+ fitsOnInternal = (sizeBytes <= storage.getStorageBytesUntilLow(target));
+ }
+
+ boolean fitsOnExternal = false;
+ if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)) {
+ final File target = new UserEnvironment(UserHandle.USER_OWNER)
+ .getExternalStorageDirectory();
+ fitsOnExternal = (sizeBytes <= storage.getStorageBytesUntilLow(target));
+ }
+
+ if (prefer == RECOMMEND_INSTALL_INTERNAL) {
+ if (fitsOnInternal) {
+ return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
+ }
+ } else if (!emulated && prefer == RECOMMEND_INSTALL_EXTERNAL) {
+ if (fitsOnExternal) {
+ return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
+ }
+ }
+
+ if (checkBoth) {
+ if (fitsOnInternal) {
+ return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
+ } else if (!emulated && fitsOnExternal) {
+ return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
+ }
+ }
+
+ /*
+ * If they requested to be on the external media by default, return that
+ * the media was unavailable. Otherwise, indicate there was insufficient
+ * storage space available.
+ */
+ if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)
+ && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+ return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;
+ } else {
+ return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;
+ }
+ }
+
+ public static String replaceEnd(String str, String before, String after) {
+ if (!str.endsWith(before)) {
+ throw new IllegalArgumentException(
+ "Expected " + str + " to end with " + before);
+ }
+ return str.substring(0, str.length() - before.length()) + after;
+ }
}
diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
index d801571..6eb0099 100644
--- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java
+++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
@@ -974,6 +974,16 @@
}
}
+ public boolean isShowImeWithHardKeyboardEnabled() {
+ return Settings.Secure.getIntForUser(mResolver,
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mCurrentUserId) == 1;
+ }
+
+ public void setShowImeWithHardKeyboard(boolean show) {
+ Settings.Secure.putIntForUser(mResolver, Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,
+ show ? 1 : 0, mCurrentUserId);
+ }
+
public int getCurrentUserId() {
return mCurrentUserId;
}
diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java
index 63be2d4..ee406bd 100644
--- a/core/java/com/android/internal/os/BatteryStatsHelper.java
+++ b/core/java/com/android/internal/os/BatteryStatsHelper.java
@@ -74,6 +74,7 @@
final private Context mContext;
final private boolean mCollectBatteryBroadcast;
+ final private boolean mWifiOnly;
private IBatteryStats mBatteryInfo;
private BatteryStats mStats;
@@ -123,6 +124,19 @@
public BatteryStatsHelper(Context context, boolean collectBatteryBroadcast) {
mContext = context;
mCollectBatteryBroadcast = collectBatteryBroadcast;
+ mWifiOnly = checkWifiOnly(context);
+ }
+
+ public BatteryStatsHelper(Context context, boolean collectBatteryBroadcast, boolean wifiOnly) {
+ mContext = context;
+ mCollectBatteryBroadcast = collectBatteryBroadcast;
+ mWifiOnly = wifiOnly;
+ }
+
+ public static boolean checkWifiOnly(Context context) {
+ ConnectivityManager cm = (ConnectivityManager)context.getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+ return !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
}
public void storeStatsHistoryInFile(String fname) {
@@ -870,9 +884,7 @@
addBluetoothUsage();
addIdleUsage(); // Not including cellular idle power
// Don't compute radio usage if it's a wifi-only device
- ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- if (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
+ if (!mWifiOnly) {
addRadioUsage();
}
}
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index ee0d14b..299b0e6 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -45,9 +45,11 @@
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.util.LogWriter;
+import android.util.MutableInt;
import android.util.PrintWriterPrinter;
import android.util.Printer;
import android.util.Slog;
@@ -103,9 +105,7 @@
// The maximum number of names wakelocks we will keep track of
// per uid; once the limit is reached, we batch the remaining wakelocks
// in to one common name.
- private static final int MAX_WAKELOCKS_PER_UID = 50;
-
- private static final String BATCHED_WAKELOCK_NAME = "*overflow*";
+ private static final int MAX_WAKELOCKS_PER_UID = 100;
private static int sNumSpeedSteps;
@@ -1550,6 +1550,140 @@
}
}
+ public abstract class OverflowArrayMap<T> {
+ private static final String OVERFLOW_NAME = "*overflow*";
+
+ final ArrayMap<String, T> mMap = new ArrayMap<>();
+ T mCurOverflow;
+ ArrayMap<String, MutableInt> mActiveOverflow;
+
+ public OverflowArrayMap() {
+ }
+
+ public ArrayMap<String, T> getMap() {
+ return mMap;
+ }
+
+ public void clear() {
+ mMap.clear();
+ mCurOverflow = null;
+ mActiveOverflow = null;
+ }
+
+ public void add(String name, T obj) {
+ mMap.put(name, obj);
+ if (OVERFLOW_NAME.equals(name)) {
+ mCurOverflow = obj;
+ }
+ }
+
+ public void cleanup() {
+ if (mActiveOverflow != null) {
+ if (mActiveOverflow.size() == 0) {
+ mActiveOverflow = null;
+ }
+ }
+ if (mActiveOverflow == null) {
+ // There is no currently active overflow, so we should no longer have
+ // an overflow entry.
+ if (mMap.containsKey(OVERFLOW_NAME)) {
+ Slog.wtf(TAG, "Cleaning up with no active overflow, but have overflow entry "
+ + mMap.get(OVERFLOW_NAME));
+ mMap.remove(OVERFLOW_NAME);
+ }
+ mCurOverflow = null;
+ } else {
+ // There is currently active overflow, so we should still have an overflow entry.
+ if (mCurOverflow == null || !mMap.containsKey(OVERFLOW_NAME)) {
+ Slog.wtf(TAG, "Cleaning up with active overflow, but no overflow entry: cur="
+ + mCurOverflow + " map=" + mMap.get(OVERFLOW_NAME));
+ }
+ }
+ }
+
+ public T startObject(String name) {
+ T obj = mMap.get(name);
+ if (obj != null) {
+ return obj;
+ }
+
+ // No object exists for the given name, but do we currently have it
+ // running as part of the overflow?
+ if (mActiveOverflow != null) {
+ MutableInt over = mActiveOverflow.get(name);
+ if (over != null) {
+ // We are already actively counting this name in the overflow object.
+ obj = mCurOverflow;
+ if (obj == null) {
+ // Shouldn't be here, but we'll try to recover.
+ Slog.wtf(TAG, "Have active overflow " + name + " but null overflow");
+ obj = mCurOverflow = instantiateObject();
+ mMap.put(OVERFLOW_NAME, obj);
+ }
+ over.value++;
+ return obj;
+ }
+ }
+
+ // No object exists for given name nor in the overflow; we need to make
+ // a new one.
+ final int N = mMap.size();
+ if (N >= MAX_WAKELOCKS_PER_UID) {
+ // Went over the limit on number of objects to track; this one goes
+ // in to the overflow.
+ obj = mCurOverflow;
+ if (obj == null) {
+ // Need to start overflow now...
+ obj = mCurOverflow = instantiateObject();
+ mMap.put(OVERFLOW_NAME, obj);
+ }
+ if (mActiveOverflow == null) {
+ mActiveOverflow = new ArrayMap<>();
+ }
+ mActiveOverflow.put(name, new MutableInt(1));
+ return obj;
+ }
+
+ // Normal case where we just need to make a new object.
+ obj = instantiateObject();
+ mMap.put(name, obj);
+ return obj;
+ }
+
+ public T stopObject(String name) {
+ T obj = mMap.get(name);
+ if (obj != null) {
+ return obj;
+ }
+
+ // No object exists for the given name, but do we currently have it
+ // running as part of the overflow?
+ if (mActiveOverflow != null) {
+ MutableInt over = mActiveOverflow.get(name);
+ if (over != null) {
+ // We are already actively counting this name in the overflow object.
+ obj = mCurOverflow;
+ if (obj != null) {
+ over.value--;
+ if (over.value <= 0) {
+ mActiveOverflow.remove(name);
+ }
+ return obj;
+ }
+ }
+ }
+
+ // Huh, they are stopping an active operation but we can't find one!
+ // That's not good.
+ Slog.wtf(TAG, "Unable to find object for " + name + " mapsize="
+ + mMap.size() + " activeoverflow=" + mActiveOverflow
+ + " curoverflow=" + mCurOverflow);
+ return null;
+ }
+
+ public abstract T instantiateObject();
+ }
+
/*
* Get the wakeup reason counter, and create a new one if one
* doesn't already exist.
@@ -3744,6 +3878,7 @@
}
public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {
+ if (TextUtils.isEmpty(iface)) return;
if (ConnectivityManager.isNetworkTypeMobile(networkType)) {
mMobileIfaces = includeInStringArray(mMobileIfaces, iface);
if (DEBUG) Slog.d(TAG, "Note mobile iface " + iface + ": " + mMobileIfaces);
@@ -3993,17 +4128,27 @@
/**
* The statistics we have collected for this uid's wake locks.
*/
- final ArrayMap<String, Wakelock> mWakelockStats = new ArrayMap<String, Wakelock>();
+ final OverflowArrayMap<Wakelock> mWakelockStats = new OverflowArrayMap<Wakelock>() {
+ @Override public Wakelock instantiateObject() { return new Wakelock(); }
+ };
/**
* The statistics we have collected for this uid's syncs.
*/
- final ArrayMap<String, StopwatchTimer> mSyncStats = new ArrayMap<String, StopwatchTimer>();
+ final OverflowArrayMap<StopwatchTimer> mSyncStats = new OverflowArrayMap<StopwatchTimer>() {
+ @Override public StopwatchTimer instantiateObject() {
+ return new StopwatchTimer(Uid.this, SYNC, null, mOnBatteryTimeBase);
+ }
+ };
/**
* The statistics we have collected for this uid's jobs.
*/
- final ArrayMap<String, StopwatchTimer> mJobStats = new ArrayMap<String, StopwatchTimer>();
+ final OverflowArrayMap<StopwatchTimer> mJobStats = new OverflowArrayMap<StopwatchTimer>() {
+ @Override public StopwatchTimer instantiateObject() {
+ return new StopwatchTimer(Uid.this, JOB, null, mOnBatteryTimeBase);
+ }
+ };
/**
* The statistics we have collected for this uid's sensor activations.
@@ -4041,17 +4186,17 @@
@Override
public Map<String, ? extends BatteryStats.Uid.Wakelock> getWakelockStats() {
- return mWakelockStats;
+ return mWakelockStats.getMap();
}
@Override
public Map<String, ? extends BatteryStats.Timer> getSyncStats() {
- return mSyncStats;
+ return mSyncStats.getMap();
}
@Override
public Map<String, ? extends BatteryStats.Timer> getJobStats() {
- return mJobStats;
+ return mJobStats.getMap();
}
@Override
@@ -4565,32 +4710,38 @@
mMobileRadioActiveCount.reset(false);
}
- for (int iw=mWakelockStats.size()-1; iw>=0; iw--) {
- Wakelock wl = mWakelockStats.valueAt(iw);
+ final ArrayMap<String, Wakelock> wakeStats = mWakelockStats.getMap();
+ for (int iw=wakeStats.size()-1; iw>=0; iw--) {
+ Wakelock wl = wakeStats.valueAt(iw);
if (wl.reset()) {
- mWakelockStats.removeAt(iw);
+ wakeStats.removeAt(iw);
} else {
active = true;
}
}
- for (int is=mSyncStats.size()-1; is>=0; is--) {
- StopwatchTimer timer = mSyncStats.valueAt(is);
+ mWakelockStats.cleanup();
+ final ArrayMap<String, StopwatchTimer> syncStats = mSyncStats.getMap();
+ for (int is=syncStats.size()-1; is>=0; is--) {
+ StopwatchTimer timer = syncStats.valueAt(is);
if (timer.reset(false)) {
- mSyncStats.removeAt(is);
+ syncStats.removeAt(is);
timer.detach();
} else {
active = true;
}
}
- for (int ij=mJobStats.size()-1; ij>=0; ij--) {
- StopwatchTimer timer = mJobStats.valueAt(ij);
+ mSyncStats.cleanup();
+ final ArrayMap<String, StopwatchTimer> jobStats = mJobStats.getMap();
+ for (int ij=jobStats.size()-1; ij>=0; ij--) {
+ StopwatchTimer timer = jobStats.valueAt(ij);
if (timer.reset(false)) {
- mJobStats.removeAt(ij);
+ jobStats.removeAt(ij);
timer.detach();
} else {
active = true;
}
}
+ mJobStats.cleanup();
for (int ise=mSensorStats.size()-1; ise>=0; ise--) {
Sensor s = mSensorStats.valueAt(ise);
if (s.reset()) {
@@ -4685,27 +4836,30 @@
}
void writeToParcelLocked(Parcel out, long elapsedRealtimeUs) {
- int NW = mWakelockStats.size();
+ final ArrayMap<String, Wakelock> wakeStats = mWakelockStats.getMap();
+ int NW = wakeStats.size();
out.writeInt(NW);
for (int iw=0; iw<NW; iw++) {
- out.writeString(mWakelockStats.keyAt(iw));
- Uid.Wakelock wakelock = mWakelockStats.valueAt(iw);
+ out.writeString(wakeStats.keyAt(iw));
+ Uid.Wakelock wakelock = wakeStats.valueAt(iw);
wakelock.writeToParcelLocked(out, elapsedRealtimeUs);
}
- int NS = mSyncStats.size();
+ final ArrayMap<String, StopwatchTimer> syncStats = mSyncStats.getMap();
+ int NS = syncStats.size();
out.writeInt(NS);
for (int is=0; is<NS; is++) {
- out.writeString(mSyncStats.keyAt(is));
- StopwatchTimer timer = mSyncStats.valueAt(is);
+ out.writeString(syncStats.keyAt(is));
+ StopwatchTimer timer = syncStats.valueAt(is);
Timer.writeTimerToParcel(out, timer, elapsedRealtimeUs);
}
- int NJ = mJobStats.size();
+ final ArrayMap<String, StopwatchTimer> jobStats = mJobStats.getMap();
+ int NJ = jobStats.size();
out.writeInt(NJ);
for (int ij=0; ij<NJ; ij++) {
- out.writeString(mJobStats.keyAt(ij));
- StopwatchTimer timer = mJobStats.valueAt(ij);
+ out.writeString(jobStats.keyAt(ij));
+ StopwatchTimer timer = jobStats.valueAt(ij);
Timer.writeTimerToParcel(out, timer, elapsedRealtimeUs);
}
@@ -4824,10 +4978,7 @@
String wakelockName = in.readString();
Uid.Wakelock wakelock = new Wakelock();
wakelock.readFromParcelLocked(timeBase, screenOffTimeBase, in);
- // We will just drop some random set of wakelocks if
- // the previous run of the system was an older version
- // that didn't impose a limit.
- mWakelockStats.put(wakelockName, wakelock);
+ mWakelockStats.add(wakelockName, wakelock);
}
int numSyncs = in.readInt();
@@ -4835,7 +4986,7 @@
for (int j = 0; j < numSyncs; j++) {
String syncName = in.readString();
if (in.readInt() != 0) {
- mSyncStats.put(syncName,
+ mSyncStats.add(syncName,
new StopwatchTimer(Uid.this, SYNC, null, timeBase, in));
}
}
@@ -4845,7 +4996,7 @@
for (int j = 0; j < numJobs; j++) {
String jobName = in.readString();
if (in.readInt() != 0) {
- mJobStats.put(jobName, new StopwatchTimer(Uid.this, JOB, null, timeBase, in));
+ mJobStats.add(jobName, new StopwatchTimer(Uid.this, JOB, null, timeBase, in));
}
}
@@ -5056,6 +5207,38 @@
default: throw new IllegalArgumentException("type = " + type);
}
}
+
+ public StopwatchTimer getStopwatchTimer(int type) {
+ StopwatchTimer t;
+ switch (type) {
+ case WAKE_TYPE_PARTIAL:
+ t = mTimerPartial;
+ if (t == null) {
+ t = new StopwatchTimer(Uid.this, WAKE_TYPE_PARTIAL,
+ mPartialTimers, mOnBatteryScreenOffTimeBase);
+ mTimerPartial = t;
+ }
+ return t;
+ case WAKE_TYPE_FULL:
+ t = mTimerFull;
+ if (t == null) {
+ t = new StopwatchTimer(Uid.this, WAKE_TYPE_FULL,
+ mFullTimers, mOnBatteryTimeBase);
+ mTimerFull = t;
+ }
+ return t;
+ case WAKE_TYPE_WINDOW:
+ t = mTimerWindow;
+ if (t == null) {
+ t = new StopwatchTimer(Uid.this, WAKE_TYPE_WINDOW,
+ mWindowTimers, mOnBatteryTimeBase);
+ mTimerWindow = t;
+ }
+ return t;
+ default:
+ throw new IllegalArgumentException("type=" + type);
+ }
+ }
}
public final class Sensor extends BatteryStats.Uid.Sensor {
@@ -5923,79 +6106,29 @@
return ss;
}
- public StopwatchTimer getSyncTimerLocked(String name) {
- StopwatchTimer t = mSyncStats.get(name);
- if (t == null) {
- final int N = mSyncStats.size();
- if (N > MAX_WAKELOCKS_PER_UID) {
- name = BATCHED_WAKELOCK_NAME;
- t = mSyncStats.get(name);
- }
- if (t == null) {
- t = new StopwatchTimer(Uid.this, SYNC, null, mOnBatteryTimeBase);
- mSyncStats.put(name, t);
- }
- }
- return t;
+ public void readSyncSummaryFromParcelLocked(String name, Parcel in) {
+ StopwatchTimer timer = mSyncStats.instantiateObject();
+ timer.readSummaryFromParcelLocked(in);
+ mSyncStats.add(name, timer);
}
- public StopwatchTimer getJobTimerLocked(String name) {
- StopwatchTimer t = mJobStats.get(name);
- if (t == null) {
- final int N = mJobStats.size();
- if (N > MAX_WAKELOCKS_PER_UID) {
- name = BATCHED_WAKELOCK_NAME;
- t = mJobStats.get(name);
- }
- if (t == null) {
- t = new StopwatchTimer(Uid.this, JOB, null, mOnBatteryTimeBase);
- mJobStats.put(name, t);
- }
- }
- return t;
+ public void readJobSummaryFromParcelLocked(String name, Parcel in) {
+ StopwatchTimer timer = mJobStats.instantiateObject();
+ timer.readSummaryFromParcelLocked(in);
+ mJobStats.add(name, timer);
}
- public StopwatchTimer getWakeTimerLocked(String name, int type) {
- Wakelock wl = mWakelockStats.get(name);
- if (wl == null) {
- final int N = mWakelockStats.size();
- if (N > MAX_WAKELOCKS_PER_UID) {
- name = BATCHED_WAKELOCK_NAME;
- wl = mWakelockStats.get(name);
- }
- if (wl == null) {
- wl = new Wakelock();
- mWakelockStats.put(name, wl);
- }
+ public void readWakeSummaryFromParcelLocked(String wlName, Parcel in) {
+ Wakelock wl = new Wakelock();
+ mWakelockStats.add(wlName, wl);
+ if (in.readInt() != 0) {
+ wl.getStopwatchTimer(WAKE_TYPE_FULL).readSummaryFromParcelLocked(in);
}
- StopwatchTimer t = null;
- switch (type) {
- case WAKE_TYPE_PARTIAL:
- t = wl.mTimerPartial;
- if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_PARTIAL,
- mPartialTimers, mOnBatteryScreenOffTimeBase);
- wl.mTimerPartial = t;
- }
- return t;
- case WAKE_TYPE_FULL:
- t = wl.mTimerFull;
- if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_FULL,
- mFullTimers, mOnBatteryTimeBase);
- wl.mTimerFull = t;
- }
- return t;
- case WAKE_TYPE_WINDOW:
- t = wl.mTimerWindow;
- if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_WINDOW,
- mWindowTimers, mOnBatteryTimeBase);
- wl.mTimerWindow = t;
- }
- return t;
- default:
- throw new IllegalArgumentException("type=" + type);
+ if (in.readInt() != 0) {
+ wl.getStopwatchTimer(WAKE_TYPE_PARTIAL).readSummaryFromParcelLocked(in);
+ }
+ if (in.readInt() != 0) {
+ wl.getStopwatchTimer(WAKE_TYPE_WINDOW).readSummaryFromParcelLocked(in);
}
}
@@ -6023,37 +6156,37 @@
}
public void noteStartSyncLocked(String name, long elapsedRealtimeMs) {
- StopwatchTimer t = getSyncTimerLocked(name);
+ StopwatchTimer t = mSyncStats.startObject(name);
if (t != null) {
t.startRunningLocked(elapsedRealtimeMs);
}
}
public void noteStopSyncLocked(String name, long elapsedRealtimeMs) {
- StopwatchTimer t = getSyncTimerLocked(name);
+ StopwatchTimer t = mSyncStats.stopObject(name);
if (t != null) {
t.stopRunningLocked(elapsedRealtimeMs);
}
}
public void noteStartJobLocked(String name, long elapsedRealtimeMs) {
- StopwatchTimer t = getJobTimerLocked(name);
+ StopwatchTimer t = mJobStats.stopObject(name);
if (t != null) {
t.startRunningLocked(elapsedRealtimeMs);
}
}
public void noteStopJobLocked(String name, long elapsedRealtimeMs) {
- StopwatchTimer t = getJobTimerLocked(name);
+ StopwatchTimer t = mJobStats.stopObject(name);
if (t != null) {
t.stopRunningLocked(elapsedRealtimeMs);
}
}
public void noteStartWakeLocked(int pid, String name, int type, long elapsedRealtimeMs) {
- StopwatchTimer t = getWakeTimerLocked(name, type);
- if (t != null) {
- t.startRunningLocked(elapsedRealtimeMs);
+ Wakelock wl = mWakelockStats.startObject(name);
+ if (wl != null) {
+ wl.getStopwatchTimer(type).startRunningLocked(elapsedRealtimeMs);
}
if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
Pid p = getPidStatsLocked(pid);
@@ -6064,9 +6197,9 @@
}
public void noteStopWakeLocked(int pid, String name, int type, long elapsedRealtimeMs) {
- StopwatchTimer t = getWakeTimerLocked(name, type);
- if (t != null) {
- t.stopRunningLocked(elapsedRealtimeMs);
+ Wakelock wl = mWakelockStats.stopObject(name);
+ if (wl != null) {
+ wl.getStopwatchTimer(type).stopRunningLocked(elapsedRealtimeMs);
}
if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
Pid p = mPids.get(pid);
@@ -7772,15 +7905,7 @@
}
for (int iw = 0; iw < NW; iw++) {
String wlName = in.readString();
- if (in.readInt() != 0) {
- u.getWakeTimerLocked(wlName, WAKE_TYPE_FULL).readSummaryFromParcelLocked(in);
- }
- if (in.readInt() != 0) {
- u.getWakeTimerLocked(wlName, WAKE_TYPE_PARTIAL).readSummaryFromParcelLocked(in);
- }
- if (in.readInt() != 0) {
- u.getWakeTimerLocked(wlName, WAKE_TYPE_WINDOW).readSummaryFromParcelLocked(in);
- }
+ u.readWakeSummaryFromParcelLocked(wlName, in);
}
int NS = in.readInt();
@@ -7790,7 +7915,7 @@
}
for (int is = 0; is < NS; is++) {
String name = in.readString();
- u.getSyncTimerLocked(name).readSummaryFromParcelLocked(in);
+ u.readSyncSummaryFromParcelLocked(name, in);
}
int NJ = in.readInt();
@@ -7800,7 +7925,7 @@
}
for (int ij = 0; ij < NJ; ij++) {
String name = in.readString();
- u.getJobTimerLocked(name).readSummaryFromParcelLocked(in);
+ u.readJobSummaryFromParcelLocked(name, in);
}
int NP = in.readInt();
@@ -8064,11 +8189,12 @@
u.mMobileRadioActiveCount.writeSummaryFromParcelLocked(out);
}
- int NW = u.mWakelockStats.size();
+ final ArrayMap<String, Uid.Wakelock> wakeStats = u.mWakelockStats.getMap();
+ int NW = wakeStats.size();
out.writeInt(NW);
for (int iw=0; iw<NW; iw++) {
- out.writeString(u.mWakelockStats.keyAt(iw));
- Uid.Wakelock wl = u.mWakelockStats.valueAt(iw);
+ out.writeString(wakeStats.keyAt(iw));
+ Uid.Wakelock wl = wakeStats.valueAt(iw);
if (wl.mTimerFull != null) {
out.writeInt(1);
wl.mTimerFull.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
@@ -8089,18 +8215,20 @@
}
}
- int NS = u.mSyncStats.size();
+ final ArrayMap<String, StopwatchTimer> syncStats = u.mSyncStats.getMap();
+ int NS = syncStats.size();
out.writeInt(NS);
for (int is=0; is<NS; is++) {
- out.writeString(u.mSyncStats.keyAt(is));
- u.mSyncStats.valueAt(is).writeSummaryFromParcelLocked(out, NOWREAL_SYS);
+ out.writeString(syncStats.keyAt(is));
+ syncStats.valueAt(is).writeSummaryFromParcelLocked(out, NOWREAL_SYS);
}
- int NJ = u.mJobStats.size();
+ final ArrayMap<String, StopwatchTimer> jobStats = u.mJobStats.getMap();
+ int NJ = jobStats.size();
out.writeInt(NJ);
for (int ij=0; ij<NJ; ij++) {
- out.writeString(u.mJobStats.keyAt(ij));
- u.mJobStats.valueAt(ij).writeSummaryFromParcelLocked(out, NOWREAL_SYS);
+ out.writeString(jobStats.keyAt(ij));
+ jobStats.valueAt(ij).writeSummaryFromParcelLocked(out, NOWREAL_SYS);
}
int NSE = u.mSensorStats.size();
diff --git a/core/java/com/android/internal/os/InstallerConnection.java b/core/java/com/android/internal/os/InstallerConnection.java
new file mode 100644
index 0000000..e3f229f
--- /dev/null
+++ b/core/java/com/android/internal/os/InstallerConnection.java
@@ -0,0 +1,207 @@
+/*
+ * 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 com.android.internal.os;
+
+import android.net.LocalSocket;
+import android.net.LocalSocketAddress;
+import android.util.Slog;
+import libcore.io.IoUtils;
+import libcore.io.Streams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Represents a connection to {@code installd}. Allows multiple connect and
+ * disconnect cycles.
+ *
+ * @hide for internal use only
+ */
+public class InstallerConnection {
+ private static final String TAG = "InstallerConnection";
+ private static final boolean LOCAL_DEBUG = false;
+
+ private InputStream mIn;
+ private OutputStream mOut;
+ private LocalSocket mSocket;
+
+ private final byte buf[] = new byte[1024];
+
+ public InstallerConnection() {
+ }
+
+ public synchronized String transact(String cmd) {
+ if (!connect()) {
+ Slog.e(TAG, "connection failed");
+ return "-1";
+ }
+
+ if (!writeCommand(cmd)) {
+ /*
+ * If installd died and restarted in the background (unlikely but
+ * possible) we'll fail on the next write (this one). Try to
+ * reconnect and write the command one more time before giving up.
+ */
+ Slog.e(TAG, "write command failed? reconnect!");
+ if (!connect() || !writeCommand(cmd)) {
+ return "-1";
+ }
+ }
+ if (LOCAL_DEBUG) {
+ Slog.i(TAG, "send: '" + cmd + "'");
+ }
+
+ final int replyLength = readReply();
+ if (replyLength > 0) {
+ String s = new String(buf, 0, replyLength);
+ if (LOCAL_DEBUG) {
+ Slog.i(TAG, "recv: '" + s + "'");
+ }
+ return s;
+ } else {
+ if (LOCAL_DEBUG) {
+ Slog.i(TAG, "fail");
+ }
+ return "-1";
+ }
+ }
+
+ public int execute(String cmd) {
+ String res = transact(cmd);
+ try {
+ return Integer.parseInt(res);
+ } catch (NumberFormatException ex) {
+ return -1;
+ }
+ }
+
+ public int dexopt(String apkPath, int uid, boolean isPublic, String instructionSet) {
+ StringBuilder builder = new StringBuilder("dexopt");
+ builder.append(' ');
+ builder.append(apkPath);
+ builder.append(' ');
+ builder.append(uid);
+ builder.append(isPublic ? " 1" : " 0");
+ builder.append(" *"); // No pkgName arg present
+ builder.append(' ');
+ builder.append(instructionSet);
+ return execute(builder.toString());
+ }
+
+ public int patchoat(String apkPath, int uid, boolean isPublic, String instructionSet) {
+ StringBuilder builder = new StringBuilder("patchoat");
+ builder.append(' ');
+ builder.append(apkPath);
+ builder.append(' ');
+ builder.append(uid);
+ builder.append(isPublic ? " 1" : " 0");
+ builder.append(" *"); // No pkgName arg present
+ builder.append(' ');
+ builder.append(instructionSet);
+ return execute(builder.toString());
+ }
+
+ private boolean connect() {
+ if (mSocket != null) {
+ return true;
+ }
+ Slog.i(TAG, "connecting...");
+ try {
+ mSocket = new LocalSocket();
+
+ LocalSocketAddress address = new LocalSocketAddress("installd",
+ LocalSocketAddress.Namespace.RESERVED);
+
+ mSocket.connect(address);
+
+ mIn = mSocket.getInputStream();
+ mOut = mSocket.getOutputStream();
+ } catch (IOException ex) {
+ disconnect();
+ return false;
+ }
+ return true;
+ }
+
+ public void disconnect() {
+ Slog.i(TAG, "disconnecting...");
+ IoUtils.closeQuietly(mSocket);
+ IoUtils.closeQuietly(mIn);
+ IoUtils.closeQuietly(mOut);
+
+ mSocket = null;
+ mIn = null;
+ mOut = null;
+ }
+
+
+ private boolean readFully(byte[] buffer, int len) {
+ try {
+ Streams.readFully(mIn, buffer, 0, len);
+ } catch (IOException ioe) {
+ Slog.e(TAG, "read exception");
+ disconnect();
+ return false;
+ }
+
+ if (LOCAL_DEBUG) {
+ Slog.i(TAG, "read " + len + " bytes");
+ }
+
+ return true;
+ }
+
+ private int readReply() {
+ if (!readFully(buf, 2)) {
+ return -1;
+ }
+
+ final int len = (((int) buf[0]) & 0xff) | ((((int) buf[1]) & 0xff) << 8);
+ if ((len < 1) || (len > buf.length)) {
+ Slog.e(TAG, "invalid reply length (" + len + ")");
+ disconnect();
+ return -1;
+ }
+
+ if (!readFully(buf, len)) {
+ return -1;
+ }
+
+ return len;
+ }
+
+ private boolean writeCommand(String cmdString) {
+ final byte[] cmd = cmdString.getBytes();
+ final int len = cmd.length;
+ if ((len < 1) || (len > buf.length)) {
+ return false;
+ }
+
+ buf[0] = (byte) (len & 0xff);
+ buf[1] = (byte) ((len >> 8) & 0xff);
+ try {
+ mOut.write(buf, 0, 2);
+ mOut.write(cmd, 0, len);
+ } catch (IOException ex) {
+ Slog.e(TAG, "write error");
+ disconnect();
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 4a26b4b..d35fce4 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -192,13 +192,14 @@
*
* @param className Fully-qualified class name
* @param argv Argument vector for main()
+ * @param classLoader the classLoader to load {@className} with
*/
- private static void invokeStaticMain(String className, String[] argv)
+ private static void invokeStaticMain(String className, String[] argv, ClassLoader classLoader)
throws ZygoteInit.MethodAndArgsCaller {
Class<?> cl;
try {
- cl = Class.forName(className);
+ cl = Class.forName(className, true, classLoader);
} catch (ClassNotFoundException ex) {
throw new RuntimeException(
"Missing class when invoking static main " + className,
@@ -263,7 +264,7 @@
* @param targetSdkVersion target SDK version
* @param argv arg strings
*/
- public static final void zygoteInit(int targetSdkVersion, String[] argv)
+ public static final void zygoteInit(int targetSdkVersion, String[] argv, ClassLoader classLoader)
throws ZygoteInit.MethodAndArgsCaller {
if (DEBUG) Slog.d(TAG, "RuntimeInit: Starting application from zygote");
@@ -272,7 +273,7 @@
commonInit();
nativeZygoteInit();
- applicationInit(targetSdkVersion, argv);
+ applicationInit(targetSdkVersion, argv, classLoader);
}
/**
@@ -290,10 +291,10 @@
throws ZygoteInit.MethodAndArgsCaller {
if (DEBUG) Slog.d(TAG, "RuntimeInit: Starting application from wrapper");
- applicationInit(targetSdkVersion, argv);
+ applicationInit(targetSdkVersion, argv, null);
}
- private static void applicationInit(int targetSdkVersion, String[] argv)
+ private static void applicationInit(int targetSdkVersion, String[] argv, ClassLoader classLoader)
throws ZygoteInit.MethodAndArgsCaller {
// If the application calls System.exit(), terminate the process
// immediately without running any shutdown hooks. It is not possible to
@@ -317,7 +318,7 @@
}
// Remaining arguments are passed to the start class's static main
- invokeStaticMain(args.startClass, args.startArgs);
+ invokeStaticMain(args.startClass, args.startArgs, classLoader);
}
/**
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 0c48368..43ebb3d 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -863,7 +863,7 @@
pipeFd, parsedArgs.remainingArgs);
} else {
RuntimeInit.zygoteInit(parsedArgs.targetSdkVersion,
- parsedArgs.remainingArgs);
+ parsedArgs.remainingArgs, null /* classLoader */);
}
} else {
String className;
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index eea4201..051de6e 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -34,8 +34,11 @@
import android.system.OsConstants;
import android.util.EventLog;
import android.util.Log;
+import android.util.Slog;
import android.webkit.WebViewFactory;
+import dalvik.system.DexFile;
+import dalvik.system.PathClassLoader;
import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
@@ -493,21 +496,69 @@
Process.setArgV0(parsedArgs.niceName);
}
+ final String systemServerClasspath = Os.getenv("SYSTEMSERVERCLASSPATH");
+ if (systemServerClasspath != null) {
+ performSystemServerDexOpt(systemServerClasspath);
+ }
+
if (parsedArgs.invokeWith != null) {
+ String[] args = parsedArgs.remainingArgs;
+ // If we have a non-null system server class path, we'll have to duplicate the
+ // existing arguments and append the classpath to it. ART will handle the classpath
+ // correctly when we exec a new process.
+ if (systemServerClasspath != null) {
+ String[] amendedArgs = new String[args.length + 2];
+ amendedArgs[0] = "-cp";
+ amendedArgs[1] = systemServerClasspath;
+ System.arraycopy(parsedArgs.remainingArgs, 0, amendedArgs, 2, parsedArgs.remainingArgs.length);
+ }
+
WrapperInit.execApplication(parsedArgs.invokeWith,
parsedArgs.niceName, parsedArgs.targetSdkVersion,
- null, parsedArgs.remainingArgs);
+ null, args);
} else {
+ ClassLoader cl = null;
+ if (systemServerClasspath != null) {
+ cl = new PathClassLoader(systemServerClasspath, ClassLoader.getSystemClassLoader());
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+
/*
* Pass the remaining arguments to SystemServer.
*/
- RuntimeInit.zygoteInit(parsedArgs.targetSdkVersion, parsedArgs.remainingArgs);
+ RuntimeInit.zygoteInit(parsedArgs.targetSdkVersion, parsedArgs.remainingArgs, cl);
}
/* should never reach here */
}
/**
+ * Performs dex-opt on the elements of {@code classPath}, if needed. We
+ * choose the instruction set of the current runtime.
+ */
+ private static void performSystemServerDexOpt(String classPath) {
+ final String[] classPathElements = classPath.split(":");
+ final InstallerConnection installer = new InstallerConnection();
+ final String instructionSet = VMRuntime.getRuntime().vmInstructionSet();
+
+ try {
+ for (String classPathElement : classPathElements) {
+ final byte dexopt = DexFile.isDexOptNeededInternal(classPathElement, "*", instructionSet,
+ false /* defer */);
+ if (dexopt == DexFile.DEXOPT_NEEDED) {
+ installer.dexopt(classPathElement, Process.SYSTEM_UID, false, instructionSet);
+ } else if (dexopt == DexFile.PATCHOAT_NEEDED) {
+ installer.patchoat(classPathElement, Process.SYSTEM_UID, false, instructionSet);
+ }
+ }
+ } catch (IOException ioe) {
+ throw new RuntimeException("Error starting system_server", ioe);
+ } finally {
+ installer.disconnect();
+ }
+ }
+
+ /**
* Prepare the arguments and fork for the system server process.
*/
private static boolean startSystemServer(String abiList, String socketName)
diff --git a/core/java/com/android/internal/policy/IKeyguardService.aidl b/core/java/com/android/internal/policy/IKeyguardService.aidl
index a5421f5..64f3bea 100644
--- a/core/java/com/android/internal/policy/IKeyguardService.aidl
+++ b/core/java/com/android/internal/policy/IKeyguardService.aidl
@@ -65,4 +65,10 @@
* @param fadeoutDuration the duration of the exit animation, in milliseconds
*/
oneway void startKeyguardExitAnimation(long startTime, long fadeoutDuration);
+
+ /**
+ * Notifies the Keyguard that the activity that was starting has now been drawn and it's safe
+ * to start the keyguard dismiss sequence.
+ */
+ oneway void onActivityDrawn();
}
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 69ffbfe..57472f8 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -32,7 +32,6 @@
void topAppWindowChanged(boolean menuVisible);
void setImeWindowStatus(in IBinder token, int vis, int backDisposition,
boolean showImeSwitcher);
- void setHardKeyboardStatus(boolean available, boolean enabled);
void setWindowState(int window, int state);
void buzzBeepBlinked();
void notificationLightOff();
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index 50c82bb..8794d31 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -51,7 +51,6 @@
in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys);
void onNotificationExpansionChanged(in String key, in boolean userAction, in boolean expanded);
void setSystemUiVisibility(int vis, int mask);
- void setHardKeyboardEnabled(boolean enabled);
void setWindowState(int window, int state);
void showRecentApps(boolean triggeredFromAltTab);
diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java
index 9e24844..254f602 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -253,7 +253,7 @@
return null;
}
- private boolean isCollapsed(View view) {
+ private static boolean isCollapsed(View view) {
return view == null || view.getVisibility() == GONE || view.getMeasuredHeight() == 0;
}
@@ -326,35 +326,33 @@
* projection surfaces.
*/
private class ActionBarBackgroundDrawable extends Drawable {
- private Drawable getDrawable() {
+ @Override
+ public void draw(Canvas canvas) {
if (mIsSplit) {
if (mSplitBackground != null) {
- return mSplitBackground;
+ mSplitBackground.draw(canvas);
}
} else {
if (mBackground != null) {
- return mBackground;
+ mBackground.draw(canvas);
}
if (mStackedBackground != null && mIsStacked) {
- return mStackedBackground;
+ mStackedBackground.draw(canvas);
}
}
- return null;
- }
-
- @Override
- public void draw(Canvas canvas) {
- final Drawable drawable = getDrawable();
- if (drawable != null) {
- drawable.draw(canvas);
- }
}
@Override
public void getOutline(@NonNull Outline outline) {
- final Drawable drawable = getDrawable();
- if (drawable != null) {
- drawable.getOutline(outline);
+ if (mIsSplit) {
+ if (mSplitBackground != null) {
+ mSplitBackground.getOutline(outline);
+ }
+ } else {
+ // ignore the stacked background for shadow casting
+ if (mBackground != null) {
+ mBackground.getOutline(outline);
+ }
}
}
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
index ea36e37..5709f659 100644
--- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
+++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
@@ -184,6 +184,8 @@
Build.VERSION_CODES.KITKAT;
mFlingEstimator = new OverScroller(context);
+
+ setFocusableInTouchMode(true);
}
@Override
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 7e8d828..ece3e9d 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -18,7 +18,6 @@
import android.Manifest;
import android.app.ActivityManagerNative;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.app.admin.DevicePolicyManager;
import android.app.trust.TrustManager;
@@ -1169,7 +1168,7 @@
* @return A formatted string of the next alarm (for showing on the lock screen),
* or null if there is no next alarm.
*/
- public AlarmClockInfo getNextAlarm() {
+ public AlarmManager.AlarmClockInfo getNextAlarm() {
AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
return alarmManager.getNextAlarmClock(UserHandle.USER_CURRENT);
}
diff --git a/services/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java
similarity index 100%
rename from services/core/java/com/android/server/BootReceiver.java
rename to core/java/com/android/server/BootReceiver.java
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 480383b..2106d38 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -246,6 +246,7 @@
libminikin \
libstlport \
libprocessgroup \
+ libnativebridge \
ifeq ($(USE_OPENGL_RENDERER),true)
LOCAL_SHARED_LIBRARIES += libhwui
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 90c66d7..79b8542 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -161,10 +161,8 @@
extern int register_android_text_StaticLayout(JNIEnv *env);
extern int register_android_text_AndroidBidi(JNIEnv *env);
extern int register_android_opengl_classes(JNIEnv *env);
-extern int register_android_server_fingerprint_FingerprintService(JNIEnv* env);
-extern int register_android_server_NetworkManagementSocketTagger(JNIEnv* env);
-extern int register_android_server_Watchdog(JNIEnv* env);
extern int register_android_ddm_DdmHandleNativeHeap(JNIEnv *env);
+extern int register_android_server_NetworkManagementSocketTagger(JNIEnv* env);
extern int register_com_android_internal_os_ZygoteInit(JNIEnv* env);
extern int register_android_backup_BackupDataInput(JNIEnv *env);
extern int register_android_backup_BackupDataOutput(JNIEnv *env);
@@ -804,7 +802,7 @@
"-Xmx", "-Xcompiler-option");
if (skip_compilation) {
addOption("-Xcompiler-option");
- addOption("--compiler-filter=interpret-only");
+ addOption("--compiler-filter=verify-none");
} else {
parseCompilerOption("dalvik.vm.dex2oat-filter", dex2oatCompilerFilterBuf,
"--compiler-filter=", "-Xcompiler-option");
@@ -1338,9 +1336,7 @@
REG_JNI(register_android_media_ToneGenerator),
REG_JNI(register_android_opengl_classes),
- REG_JNI(register_android_server_fingerprint_FingerprintService),
REG_JNI(register_android_server_NetworkManagementSocketTagger),
- REG_JNI(register_android_server_Watchdog),
REG_JNI(register_android_ddm_DdmHandleNativeHeap),
REG_JNI(register_android_backup_BackupDataInput),
REG_JNI(register_android_backup_BackupDataOutput),
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp
index 9c44093..633a207 100644
--- a/core/jni/android_app_NativeActivity.cpp
+++ b/core/jni/android_app_NativeActivity.cpp
@@ -38,6 +38,8 @@
#include "android_view_InputChannel.h"
#include "android_view_KeyEvent.h"
+#include "nativebridge/native_bridge.h"
+
#define LOG_TRACE(...)
//#define LOG_TRACE(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)
@@ -251,17 +253,29 @@
const char* pathStr = env->GetStringUTFChars(path, NULL);
NativeCode* code = NULL;
-
+ bool needNativeBridge = false;
+
void* handle = dlopen(pathStr, RTLD_LAZY);
-
+ if (handle == NULL) {
+ if (NativeBridgeIsSupported(pathStr)) {
+ handle = NativeBridgeLoadLibrary(pathStr, RTLD_LAZY);
+ needNativeBridge = true;
+ }
+ }
env->ReleaseStringUTFChars(path, pathStr);
-
+
if (handle != NULL) {
+ void* funcPtr = NULL;
const char* funcStr = env->GetStringUTFChars(funcName, NULL);
- code = new NativeCode(handle, (ANativeActivity_createFunc*)
- dlsym(handle, funcStr));
+ if (needNativeBridge) {
+ funcPtr = NativeBridgeGetTrampoline(handle, funcStr, NULL, 0);
+ } else {
+ funcPtr = dlsym(handle, funcStr);
+ }
+
+ code = new NativeCode(handle, (ANativeActivity_createFunc*)funcPtr);
env->ReleaseStringUTFChars(funcName, funcStr);
-
+
if (code->createActivityFunc == NULL) {
ALOGW("ANativeActivity_onCreate not found");
delete code;
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index 697cdc6..980ead0 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -541,6 +541,15 @@
ALOGE("%s: Error while setting surface dimens %s (%d).", __FUNCTION__, strerror(-err), err);
return err;
}
+
+ // WAR - Set user dimensions also to avoid incorrect scaling after TextureView orientation
+ // change.
+ err = native_window_set_buffers_user_dimensions(anw.get(), width, height);
+ if (err != NO_ERROR) {
+ ALOGE("%s: Error while setting surface user dimens %s (%d).", __FUNCTION__, strerror(-err),
+ err);
+ return err;
+ }
return NO_ERROR;
}
@@ -624,6 +633,11 @@
return NO_ERROR;
}
+static jint LegacyCameraDevice_nativeGetJpegFooterSize(JNIEnv* env, jobject thiz) {
+ ALOGV("nativeGetJpegFooterSize");
+ return static_cast<jint>(sizeof(struct camera3_jpeg_blob));
+}
+
} // extern "C"
static JNINativeMethod gCameraDeviceMethods[] = {
@@ -657,6 +671,9 @@
{ "nativeSetNextTimestamp",
"(Landroid/view/Surface;J)I",
(void *)LegacyCameraDevice_nativeSetNextTimestamp },
+ { "nativeGetJpegFooterSize",
+ "()I",
+ (void *)LegacyCameraDevice_nativeGetJpegFooterSize },
};
// Get all the required offsets in java class and register native functions
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index 32cf286..5bd38f3 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -69,9 +69,8 @@
*/
static struct fieldIds {
jmethodID clear;
- jmethodID setInterfaceName;
- jmethodID addLinkAddress;
- jmethodID addGateway;
+ jmethodID setIpAddress;
+ jmethodID setGateway;
jmethodID addDns;
jmethodID setDomains;
jmethodID setServerAddress;
@@ -130,21 +129,16 @@
if (result == 0) {
env->CallVoidMethod(dhcpResults, dhcpResultsFieldIds.clear);
- // set mIfaceName
- // dhcpResults->setInterfaceName(ifname)
- env->CallVoidMethod(dhcpResults, dhcpResultsFieldIds.setInterfaceName, ifname);
-
// set the linkAddress
// dhcpResults->addLinkAddress(inetAddress, prefixLength)
- result = env->CallBooleanMethod(dhcpResults, dhcpResultsFieldIds.addLinkAddress,
+ result = env->CallBooleanMethod(dhcpResults, dhcpResultsFieldIds.setIpAddress,
env->NewStringUTF(ipaddr), prefixLength);
}
if (result == 0) {
// set the gateway
- // dhcpResults->addGateway(gateway)
result = env->CallBooleanMethod(dhcpResults,
- dhcpResultsFieldIds.addGateway, env->NewStringUTF(gateway));
+ dhcpResultsFieldIds.setGateway, env->NewStringUTF(gateway));
}
if (result == 0) {
@@ -279,12 +273,10 @@
LOG_FATAL_IF(dhcpResultsClass == NULL, "Unable to find class android/net/DhcpResults");
dhcpResultsFieldIds.clear =
env->GetMethodID(dhcpResultsClass, "clear", "()V");
- dhcpResultsFieldIds.setInterfaceName =
- env->GetMethodID(dhcpResultsClass, "setInterfaceName", "(Ljava/lang/String;)V");
- dhcpResultsFieldIds.addLinkAddress =
- env->GetMethodID(dhcpResultsClass, "addLinkAddress", "(Ljava/lang/String;I)Z");
- dhcpResultsFieldIds.addGateway =
- env->GetMethodID(dhcpResultsClass, "addGateway", "(Ljava/lang/String;)Z");
+ dhcpResultsFieldIds.setIpAddress =
+ env->GetMethodID(dhcpResultsClass, "setIpAddress", "(Ljava/lang/String;I)Z");
+ dhcpResultsFieldIds.setGateway =
+ env->GetMethodID(dhcpResultsClass, "setGateway", "(Ljava/lang/String;)Z");
dhcpResultsFieldIds.addDns =
env->GetMethodID(dhcpResultsClass, "addDns", "(Ljava/lang/String;)Z");
dhcpResultsFieldIds.setDomains =
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ff483ce..7809c71 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1249,13 +1249,29 @@
android:description="@string/permdesc_use_sip"
android:label="@string/permlab_use_sip" />
- <!-- @SystemApi Allows an application to request CallHandlerService implementations.
+ <!-- @SystemApi Allows an application to bind to InCallService implementations.
@hide -->
- <permission android:name="android.permission.BIND_CALL_SERVICE"
+ <permission android:name="android.permission.BIND_INCALL_SERVICE"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="system|signature"
- android:description="@string/permdesc_bind_call_service"
- android:label="@string/permlab_bind_call_service" />
+ android:description="@string/permdesc_bind_incall_service"
+ android:label="@string/permlab_bind_incall_service" />
+
+ <!-- @SystemApi Allows an application to bind to ConnectionService implementations.
+ @hide -->
+ <permission android:name="android.permission.BIND_CONNECTION_SERVICE"
+ android:permissionGroup="android.permission-group.PHONE_CALLS"
+ android:protectionLevel="system|signature"
+ android:description="@string/permdesc_bind_connection_service"
+ android:label="@string/permlab_bind_connection_service" />
+
+ <!-- @SystemApi Allows an application to control the in-call experience.
+ @hide -->
+ <permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"
+ android:permissionGroup="android.permission-group.PHONE_CALLS"
+ android:protectionLevel="system|signature"
+ android:description="@string/permdesc_control_incall_experience"
+ android:label="@string/permlab_control_incall_experience" />
<!-- ================================== -->
<!-- Permissions for sdcard interaction -->
@@ -1852,7 +1868,8 @@
android:description="@string/permdesc_manageCaCertificates" />
<!-- @SystemApi Allows an application to do certain operations needed for
- interacting with the recovery (system update) system. -->
+ interacting with the recovery (system update) system.
+ @hide -->
<permission android:name="android.permission.RECOVERY"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signature|system"
@@ -2193,14 +2210,6 @@
android:description="@string/permdesc_modifyParentalControls"
android:protectionLevel="signature" />
- <!-- Must be required by a {@link android.media.routing.MediaRouteService}
- to ensure that only the system can interact with it.
- @hide -->
- <permission android:name="android.permission.BIND_ROUTE_PROVIDER"
- android:label="@string/permlab_bindRouteProvider"
- android:description="@string/permdesc_bindRouteProvider"
- android:protectionLevel="signature" />
-
<!-- Must be required by device administration receiver, to ensure that only the
system can interact with it. -->
<permission android:name="android.permission.BIND_DEVICE_ADMIN"
@@ -2766,13 +2775,6 @@
android:description="@string/permdesc_bindConditionProviderService"
android:protectionLevel="signature" />
- <!-- Must be required by a {@link android.media.routing.MediaRouteService},
- to ensure that only the system can bind to it. -->
- <permission android:name="android.permission.BIND_MEDIA_ROUTE_SERVICE"
- android:label="@string/permlab_bindMediaRouteService"
- android:description="@string/permdesc_bindMediaRouteService"
- android:protectionLevel="signature" />
-
<!-- Must be required by an {@link android.service.dreams.DreamService},
to ensure that only the system can bind to it. -->
<permission android:name="android.permission.BIND_DREAM_SERVICE"
@@ -2802,11 +2804,11 @@
android:description="@string/permdesc_accessDrmCertificates"
android:protectionLevel="signature|system" />
- <!-- Api Allows an application to create media projection sessions.
+ <!-- Api Allows an application to manage media projection sessions.
@hide This is not a third-party API (intended for system apps). -->
- <permission android:name="android.permission.CREATE_MEDIA_PROJECTION"
- android:label="@string/permlab_createMediaProjection"
- android:description="@string/permdesc_createMediaProjection"
+ <permission android:name="android.permission.MANAGE_MEDIA_PROJECTION"
+ android:label="@string/permlab_manageMediaProjection"
+ android:description="@string/permdesc_manageMediaProjection"
android:protectionLevel="signature" />
<!-- @SystemApi Allows an application to read install sessions
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/core/res/res/anim/lock_screen_behind_enter_fade_in.xml
similarity index 61%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to core/res/res/anim/lock_screen_behind_enter_fade_in.xml
index 89f4a0b..94e40a8 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/core/res/res/anim/lock_screen_behind_enter_fade_in.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -16,7 +15,13 @@
~ limitations under the License
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="#ff000000"
+ android:detachWallpaper="true"
+ android:shareInterpolator="false"
+ android:interpolator="@interpolator/linear"
+ android:fromAlpha="0" android:toAlpha="1"
+ android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+ android:duration="250"
+ android:startOffset="100">
+</alpha>
\ No newline at end of file
diff --git a/core/res/res/anim/lock_screen_behind_enter_wallpaper.xml b/core/res/res/anim/lock_screen_behind_enter_wallpaper.xml
index 09d8001..ce974dc 100644
--- a/core/res/res/anim/lock_screen_behind_enter_wallpaper.xml
+++ b/core/res/res/anim/lock_screen_behind_enter_wallpaper.xml
@@ -22,15 +22,8 @@
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_quint"
android:duration="400"/>
- <scale
- android:fromXScale="0.94" android:toXScale="1.0"
- android:fromYScale="0.94" android:toYScale="1.0"
- android:pivotX="50%" android:pivotY="100%"
- android:fillEnabled="true" android:fillBefore="true"
- android:interpolator="@interpolator/decelerate_quint"
- android:duration="400" />
- <translate android:fromYDelta="5%" android:toYDelta="0"
+ <translate android:fromYDelta="11%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quint"
android:duration="300" />
diff --git a/core/res/res/anim/wallpaper_close_enter.xml b/core/res/res/anim/wallpaper_close_enter.xml
index 981923a..a189813 100644
--- a/core/res/res/anim/wallpaper_close_enter.xml
+++ b/core/res/res/anim/wallpaper_close_enter.xml
@@ -18,15 +18,17 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:shareInterpolator="false" android:zAdjustment="top">
- <scale android:fromXScale=".2" android:toXScale="1.0"
- android:fromYScale=".2" android:toYScale="1.0"
- android:pivotX="50%p" android:pivotY="50%p"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="300" />
+ android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">
+
<alpha android:fromAlpha="0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="300"/>
+ android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+ android:interpolator="@interpolator/decelerate_quart"
+ android:startOffset="300"
+ android:duration="167"/>
+
+ <translate android:fromYDelta="110%" android:toYDelta="0"
+ android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+ android:interpolator="@interpolator/decelerate_quint"
+ android:startOffset="300"
+ android:duration="417" />
</set>
\ No newline at end of file
diff --git a/core/res/res/anim/wallpaper_close_exit.xml b/core/res/res/anim/wallpaper_close_exit.xml
index a91eb49..12b31aef 100644
--- a/core/res/res/anim/wallpaper_close_exit.xml
+++ b/core/res/res/anim/wallpaper_close_exit.xml
@@ -20,5 +20,5 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:detachWallpaper="true" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
- android:duration="300" />
+ android:duration="417" />
</set>
\ No newline at end of file
diff --git a/core/res/res/animator/leanback_setup_fragment_close_enter.xml b/core/res/res/animator/leanback_setup_fragment_close_enter.xml
new file mode 100644
index 0000000..1626dd3
--- /dev/null
+++ b/core/res/res/animator/leanback_setup_fragment_close_enter.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <objectAnimator
+ android:propertyName="alpha"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_alpha_backward_in_content_start"
+ android:valueTo="@dimen/leanback_setup_alpha_backward_in_content_end"
+ android:duration="@integer/leanback_setup_alpha_backward_in_content_duration"
+ android:startOffset="@integer/leanback_setup_alpha_backward_in_content_delay"/>
+</set>
diff --git a/core/res/res/animator/leanback_setup_fragment_close_exit.xml b/core/res/res/animator/leanback_setup_fragment_close_exit.xml
new file mode 100644
index 0000000..a827df4
--- /dev/null
+++ b/core/res/res/animator/leanback_setup_fragment_close_exit.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <objectAnimator
+ android:propertyName="alpha"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_alpha_backward_out_content_start"
+ android:valueTo="@dimen/leanback_setup_alpha_backward_out_content_end"
+ android:duration="@integer/leanback_setup_alpha_backward_out_content_duration"
+ android:startOffset="@integer/leanback_setup_alpha_backward_out_content_delay"/>
+ <objectAnimator
+ android:propertyName="x"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_translation_backward_out_content_start"
+ android:valueTo="@dimen/leanback_setup_translation_backward_out_content_end"
+ android:duration="@integer/leanback_setup_translation_backward_out_content_duration"
+ android:startOffset="@integer/leanback_setup_translation_backward_out_content_delay"/>
+</set>
diff --git a/core/res/res/animator/leanback_setup_fragment_open_enter.xml b/core/res/res/animator/leanback_setup_fragment_open_enter.xml
new file mode 100644
index 0000000..34b9a57
--- /dev/null
+++ b/core/res/res/animator/leanback_setup_fragment_open_enter.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:propertyName="alpha"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_alpha_forward_in_content_start"
+ android:valueTo="@dimen/leanback_setup_alpha_forward_in_content_end"
+ android:duration="@integer/leanback_setup_alpha_forward_in_content_duration"
+ android:startOffset="@integer/leanback_setup_alpha_forward_in_content_delay"/>
+ <objectAnimator
+ android:propertyName="x"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_translation_forward_in_content_start"
+ android:valueTo="@dimen/leanback_setup_translation_forward_in_content_end"
+ android:duration="@integer/leanback_setup_translation_forward_in_content_duration"
+ android:startOffset="@integer/leanback_setup_translation_forward_in_content_delay" />
+</set>
diff --git a/core/res/res/animator/leanback_setup_fragment_open_exit.xml b/core/res/res/animator/leanback_setup_fragment_open_exit.xml
new file mode 100644
index 0000000..5622db4
--- /dev/null
+++ b/core/res/res/animator/leanback_setup_fragment_open_exit.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <objectAnimator
+ android:propertyName="alpha"
+ android:valueType="floatType"
+ android:valueFrom="@dimen/leanback_setup_alpha_forward_out_content_start"
+ android:valueTo="@dimen/leanback_setup_alpha_forward_out_content_end"
+ android:duration="@integer/leanback_setup_alpha_forward_out_content_duration"
+ android:startOffset="@integer/leanback_setup_alpha_forward_out_content_delay"/>
+</set>
diff --git a/core/res/res/color/primary_text_leanback_formwizard_dark.xml b/core/res/res/color/primary_text_leanback_formwizard_dark.xml
new file mode 100644
index 0000000..8fe02b2
--- /dev/null
+++ b/core/res/res/color/primary_text_leanback_formwizard_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false"
+ android:alpha="@dimen/disabled_alpha_leanback_formwizard"
+ android:color="@color/primary_text_leanback_formwizard_default_dark"/>
+ <item android:color="@color/primary_text_leanback_formwizard_default_dark"/>
+</selector>
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
index 9076900..c31194e 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
index 3c72bf8..52ed6b2 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
index d31e113..7b7cde586 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
index d0c693e..859642a 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
index dfa19b4..5b71dda 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
index 151f205..378d82d 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
index ad3ee2c..43c995a 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
index 43d66d7..c937837 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
index 13e4f8b..a60a127 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
index a09b6b2..db0bf2d 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
index be02e53..4a6adbe 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
index 655d387..98983ef 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
index e870a0a..8e7b62f 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
index 1d8f805..479a26e 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
index d348871..77d3130 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
index 941e91e..cfe684f 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
index adee78d..4a64a36 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
index e6b4ca3..29591ff 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
index 6c2bc0d..cf7cf49 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
index 763833c..2a2a9af 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
index 9a87fbc..1f7fe5f 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
index 6ccf70b..f5d7093 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
index d1c14a5..3878386 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
index c2290f0..adcb9e9 100644
--- a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
+++ b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..8af9ceb4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..81c78c6
--- /dev/null
+++ b/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
index 0238898..36ed954 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
index ada1be9..863eee1 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
index 82aec64..63e93a8 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
index 1c6ea9f..85c851d 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
index ac11400..8637636 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
index 2025972..2945c29 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
index 7420fd8..678a6c8 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
index 1f40832..238a6f1 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
index cf58e44..4a342a6 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
index 930a280..5842b19 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
index ed9bc37..3e1bd2d 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
index cddb5b0..73ed10b 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
index bc1f979..03d3dfb 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
index e6fdbcc..25085ce 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
index 3d60b43..9e4d2f3 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
index b9afdc2..ab5bd1e 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
index c3c8bf2..f5297ce 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
index 1c7e5e1..1ad56e9 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
index 6329b73..4bad055 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
index 424202c..d908034 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
index 313beca..8ed4fb4 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
index f18d86a..61d3ced 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
index 8ab48c0..dec2a82 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
index fbc2c16..6635830 100644
--- a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
+++ b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..22992c0
--- /dev/null
+++ b/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..f44a2c2
--- /dev/null
+++ b/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
index 265aeb7..df73ef7 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
index 2f036ad..baf52ed 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
index bb26440..c8f3b1c 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
index 1b70047..fe715cf 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
index b544b98..8e66e11 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
index c461f3d..537496e 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
index f57da14..2722a98 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
index 22c6fbc..81fad09 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
index cd21ac9..cda20c8 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
index a38dc87..a61ad4b 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
index d84a342..d6e8e4c 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
index b82a2eb..785168e 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
index 6a33ebf..8a648b8 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
index dafc250..03063d4 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
index 27df6ff..6159dec 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
index cb4121c..6f1c96c 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
index c5cbb75..2eaff46 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
index c69ef41..c4d9db8 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
index aff03d1..f276f16 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
index fb56ae6..cf9133e 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
index 88b9d28..8f1a6a8 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
index 8451958..5080c46 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
index 6f57654..5e39408 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
index 21bfc28..435ce21 100644
--- a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
+++ b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..2d79d59
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..36f9753
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
index c30cb5a..1eca9a9 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
index eaba558..5427211 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
index 17c18c9..43c06ab 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
index 0fce07a..6db3f1e 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
index c29b837..53b3a62 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
index ae56a41..7add520 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
index 85290ac..a4d57de 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
index 1e8513b..4b3a023 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
index 8810a12..a4caa65 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
index 717207f..2ab46c0 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
index db046f3..5c06e44 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
index c5c07a4..60d8c11 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
index c9bdf1f..b149e47 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
index 6bfd943..6a12a1f 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
index a1d3fbb..2803c7c 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
index 40c3a5b..032f6ea 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
index 26b8736..ea83c35 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
index 88c027e..2801f29 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
index 02567c6..66b89b3 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
index 037d3bf..1f8770c 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
index 0252769..0d6a95b 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
index 3ae501d..8e602db 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
index ecf2831..3143c1f 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
index 0877749..00fb83e 100644
--- a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
+++ b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..9c0b19e
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..0edb4b8
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
index bc21279..786f493 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
index b57b592..c6e1ac1f 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
index 0fb9277..2a65baa 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
index 340722d..efce521 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
index 8554a76..5566524 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
index a05e335..ee676a6 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
index a5ded14..e0bb175 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
index 0300a49..de9eada 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
index 37dd7ce..3c59ad8 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
index 6bc549a..d524098 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
index b026d5d..7c08d71 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
index 89238dc..017c2e1 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
index 1d309fe..d3f2a9a 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
index 2e58fa9..cb75295a 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
index 2ebe7a7..445644e 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
index 04bab76..5819f90 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
index 3497e48..91cb90f 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
index 42333b4..cf6147c 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
index 732e175..75fca7c 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
index 12eddd8..b71a0b4 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
index 95cbc61..edb7671 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
index 105ec07..5e0be17 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
index fac253a..b727eda 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
index 1b8d11c..a3caefb 100644
--- a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
+++ b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..78c5ebd
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..36974b7
--- /dev/null
+++ b/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/core/res/res/drawable/fastscroll_label_left_material.xml b/core/res/res/drawable/fastscroll_label_left_material.xml
new file mode 100644
index 0000000..430d1b0
--- /dev/null
+++ b/core/res/res/drawable/fastscroll_label_left_material.xml
@@ -0,0 +1,27 @@
+<?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="44dp"
+ android:topRightRadius="44dp"
+ android:bottomRightRadius="44dp" />
+ <padding
+ android:paddingLeft="22dp"
+ android:paddingRight="22dp" />
+ <solid android:color="?attr/colorControlActivated" />
+</shape>
diff --git a/core/res/res/drawable/fastscroll_label_right_material.xml b/core/res/res/drawable/fastscroll_label_right_material.xml
new file mode 100644
index 0000000..6e61397
--- /dev/null
+++ b/core/res/res/drawable/fastscroll_label_right_material.xml
@@ -0,0 +1,27 @@
+<?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="44dp"
+ android:topRightRadius="44dp"
+ android:bottomLeftRadius="44dp" />
+ <padding
+ android:paddingLeft="22dp"
+ android:paddingRight="22dp" />
+ <solid android:color="?attr/colorControlActivated" />
+</shape>
diff --git a/core/res/res/drawable/spinner_textfield_background_material.xml b/core/res/res/drawable/spinner_textfield_background_material.xml
new file mode 100644
index 0000000..f818baf
--- /dev/null
+++ b/core/res/res/drawable/spinner_textfield_background_material.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:autoMirrored="true">
+ <item android:state_checked="true">
+ <nine-patch android:src="@drawable/spinner_textfield_activated_mtrl_alpha"
+ android:tint="?attr/colorControlActivated" />
+ </item>
+ <item android:state_pressed="true">
+ <nine-patch android:src="@drawable/spinner_textfield_activated_mtrl_alpha"
+ android:tint="?attr/colorControlActivated" />
+ </item>
+ <item>
+ <nine-patch android:src="@drawable/spinner_textfield_default_mtrl_alpha"
+ android:tint="?attr/colorControlNormal" />
+ </item>
+</selector>
diff --git a/core/res/res/drawable/stat_notify_disabled_data.xml b/core/res/res/drawable/stat_notify_disabled_data.xml
index 2f6ffaf..9089d08 100644
--- a/core/res/res/drawable/stat_notify_disabled_data.xml
+++ b/core/res/res/drawable/stat_notify_disabled_data.xml
@@ -18,17 +18,7 @@
android:height="24dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
-
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M40.709,4.5l-6.604,7.337 0.0,16.601 6.604,6.604z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M32.305,13.838l-6.0629997,6.7370005 6.0629997,6.0629997z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M15.498,40.5l0.0,-7.9869995 -7.205,7.9869995z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M10.265,9.72l-2.5460005,2.545 9.971001,9.971 3.7139988,3.7140007 -4.105999,4.5619984 0.0,9.988001 6.6019993,0.0 0.0,-12.054001 1.8029995,1.8030014 0.0,10.250999 6.602001,0.0 0.0,-3.6479988 1.7999992,1.7999992 1.8479996,1.8479996 4.670002,4.669998 2.5459976,-2.5459976z"/>
+ android:pathData="M26.000000,4.100000l0.000000,6.100000c6.800000,1.000000 12.000000,6.800000 12.000000,13.800000c0.000000,1.800000 -0.400000,3.500000 -1.000000,5.100000l5.200000,3.100000c1.100000,-2.500000 1.800000,-5.200000 1.800000,-8.100000C44.000000,13.600000 36.099998,5.100000 26.000000,4.100000zM24.000000,38.000000c-7.700000,0.000000 -14.000000,-6.300000 -14.000000,-14.000000c0.000000,-7.100000 5.200000,-12.900000 12.000000,-13.800000L22.000000,4.100000C11.900000,5.100000 4.000000,13.600000 4.000000,24.000000c0.000000,11.000000 8.900000,20.000000 20.000000,20.000000c6.600000,0.000000 12.500000,-3.200000 16.100000,-8.200000l-5.200000,-3.100000C32.299999,36.000000 28.400000,38.000000 24.000000,38.000000z"/>
</vector>
diff --git a/core/res/res/layout-land/date_picker_holo.xml b/core/res/res/layout-land/date_picker_holo.xml
index af8f598..9a9b8b0 100644
--- a/core/res/res/layout-land/date_picker_holo.xml
+++ b/core/res/res/layout-land/date_picker_holo.xml
@@ -20,26 +20,11 @@
android:gravity="center"
android:orientation="horizontal" >
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:orientation="vertical" >
-
- <include layout="@layout/date_picker_header_view" />
-
- <include layout="@layout/date_picker_selected_date" />
- </LinearLayout>
-
- <include layout="@layout/date_picker_done_button" />
- </LinearLayout>
+ <include
+ layout="@layout/date_picker_selected_date"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
<include layout="@layout/date_picker_view_animator" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/core/res/res/layout-land/time_picker_holo.xml b/core/res/res/layout-land/time_picker_holo.xml
index 1725ddc..3b3d63c 100644
--- a/core/res/res/layout-land/time_picker_holo.xml
+++ b/core/res/res/layout-land/time_picker_holo.xml
@@ -30,39 +30,18 @@
android:layout_width="@dimen/timepicker_left_side_width"
android:layout_height="match_parent"
android:orientation="vertical">
- <FrameLayout
+ <include
+ layout="@layout/time_header_label"
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_weight="1">
- <include
- layout="@layout/time_header_label"
- android:layout_width="match_parent"
- android:layout_height="@dimen/timepicker_header_height"
- android:layout_gravity="center" />
- </FrameLayout>
- <LinearLayout
- android:id="@+id/layout_buttons"
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning">
- <Button
- android:id="@+id/done_button"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:text="@string/done_label"
- android:textSize="@dimen/timepicker_done_label_size" />
- </LinearLayout>
+ android:layout_weight="1"
+ android:layout_gravity="center" />
</LinearLayout>
<android.widget.RadialTimePickerView
- android:id="@+id/radial_picker"
- android:layout_width="@dimen/timepicker_radial_picker_dimen"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:focusable="true"
- android:focusableInTouchMode="true" />
-</LinearLayout>
\ No newline at end of file
+ android:id="@+id/radial_picker"
+ android:layout_width="@dimen/timepicker_radial_picker_dimen"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:focusable="true"
+ android:focusableInTouchMode="true" />
+</LinearLayout>
diff --git a/core/res/res/layout-sw600dp/date_picker_holo.xml b/core/res/res/layout-sw600dp/date_picker_holo.xml
deleted file mode 100644
index 847aa32..0000000
--- a/core/res/res/layout-sw600dp/date_picker_holo.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:background="@color/datepicker_default_view_animator_color_holo_light"
- android:gravity="center"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="@dimen/datepicker_selected_calendar_layout_height"
- android:orientation="vertical" >
-
- <include layout="@layout/date_picker_header_view" />
-
- <include layout="@layout/date_picker_selected_date" />
- </LinearLayout>
-
- <include layout="@layout/date_picker_view_animator" />
-
- <include layout="@layout/date_picker_done_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core/res/res/layout/alert_dialog_leanback_button_panel_right.xml b/core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
similarity index 80%
rename from core/res/res/layout/alert_dialog_leanback_button_panel_right.xml
rename to core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
index 829d5aa..c6e8b3b 100644
--- a/core/res/res/layout/alert_dialog_leanback_button_panel_right.xml
+++ b/core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
@@ -20,13 +20,7 @@
android:id="@+id/parentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/dialog_background_material"
- android:translationZ="@dimen/floating_window_z"
- android:layout_marginLeft="@dimen/leanback_alert_dialog_horizontal_margin"
- android:layout_marginTop="@dimen/leanback_alert_dialog_vertical_margin"
- android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
- android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin">
+ android:orientation="horizontal">
<LinearLayout
android:id="@+id/leftPanel"
@@ -46,14 +40,15 @@
android:gravity="center_vertical|start"
android:paddingStart="16dip"
android:paddingEnd="16dip"
- android:paddingTop="16dip">
+ android:paddingTop="16dip"
+ android:paddingBottom="8dip">
<ImageView android:id="@+id/icon"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_marginEnd="8dip"
android:scaleType="fitCenter"
android:src="@null" />
- <TextView android:id="@+id/alertTitle"
+ <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
style="?attr/windowTitleStyle"
android:singleLine="true"
android:ellipsize="end"
@@ -81,7 +76,7 @@
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:paddingTop="16dip"
- android:paddingBottom="16dip" />
+ android:paddingBottom="16dip" />
</ScrollView>
</LinearLayout>
@@ -90,41 +85,38 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:minHeight="64dp">
- <FrameLayout android:id="@+android:id/custom"
+ <FrameLayout android:id="@+id/custom"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
</LinearLayout>
<LinearLayout android:id="@+id/buttonPanel"
+ style="?attr/buttonBarStyle"
android:layout_width="wrap_content"
-android:background="#ffffff"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:minHeight="@dimen/alert_dialog_button_bar_height"
+ android:layout_gravity="center_vertical"
android:orientation="vertical"
- android:gravity="end"
- android:padding="16dip">
+ android:gravity="end">
<LinearLayout
- style="?attr/buttonBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layoutDirection="locale"
- android:orientation="vertical">
+ android:orientation="vertical">
<Button android:id="@+id/button3"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarNeutralButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:minHeight="@dimen/alert_dialog_button_bar_height" />
<Button android:id="@+id/button2"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarNegativeButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:minHeight="@dimen/alert_dialog_button_bar_height" />
<Button android:id="@+id/button1"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarPositiveButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml
index 6a435b2..5f9066a 100644
--- a/core/res/res/layout/alert_dialog_material.xml
+++ b/core/res/res/layout/alert_dialog_material.xml
@@ -31,9 +31,9 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|start"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
- android:paddingTop="16dip"
+ android:paddingStart="@dimen/alert_dialog_padding_material"
+ android:paddingEnd="@dimen/alert_dialog_padding_material"
+ android:paddingTop="@dimen/alert_dialog_padding_material"
android:paddingBottom="8dip">
<ImageView android:id="@+id/icon"
android:layout_width="32dip"
@@ -66,9 +66,10 @@
style="?attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
- android:paddingTop="16dip" />
+ android:paddingStart="@dimen/alert_dialog_padding_material"
+ android:paddingEnd="@dimen/alert_dialog_padding_material"
+ android:paddingTop="@dimen/alert_dialog_padding_material"
+ android:paddingBottom="@dimen/alert_dialog_padding_material" />
</ScrollView>
</LinearLayout>
@@ -83,40 +84,36 @@
</FrameLayout>
<LinearLayout android:id="@+id/buttonPanel"
+ style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="@dimen/alert_dialog_button_bar_height"
- android:orientation="vertical"
- android:gravity="end"
- android:padding="16dip">
- <LinearLayout
- style="?attr/buttonBarStyle"
- android:layout_width="match_parent"
+ android:layoutDirection="locale"
+ android:orientation="horizontal"
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
+ android:paddingBottom="6dp">
+ <Button android:id="@+id/button3"
+ style="?attr/buttonBarNeutralButtonStyle"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layoutDirection="locale">
- <Button android:id="@+id/button3"
- style="?attr/buttonBarNeutralButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="2"
- android:minHeight="@dimen/alert_dialog_button_bar_height" />
- <Space
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:visibility="invisible" />
- <Button android:id="@+id/button2"
- style="?attr/buttonBarNegativeButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="2"
- android:minHeight="@dimen/alert_dialog_button_bar_height" />
- <Button android:id="@+id/button1"
- style="?attr/buttonBarPositiveButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="2"
- android:minHeight="@dimen/alert_dialog_button_bar_height" />
- </LinearLayout>
- </LinearLayout>
+ android:maxLines="2"
+ android:minHeight="@dimen/alert_dialog_button_bar_height" />
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:visibility="invisible" />
+ <Button android:id="@+id/button2"
+ style="?attr/buttonBarNegativeButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:minHeight="@dimen/alert_dialog_button_bar_height" />
+ <Button android:id="@+id/button1"
+ style="?attr/buttonBarPositiveButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:minHeight="@dimen/alert_dialog_button_bar_height" />
+ </LinearLayout>
</LinearLayout>
diff --git a/core/res/res/layout/date_picker_done_button.xml b/core/res/res/layout/date_picker_done_button.xml
deleted file mode 100644
index b8e8c03..0000000
--- a/core/res/res/layout/date_picker_done_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/layout_buttons"
- style="?android:attr/buttonBarStyle"
- android:layout_width="@dimen/datepicker_component_width"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning" >
-
- <Button
- android:id="@+id/done"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:text="@string/done_label"
- android:textSize="@dimen/datepicker_done_label_size" />
-</LinearLayout>
diff --git a/core/res/res/layout/date_picker_header_view.xml b/core/res/res/layout/date_picker_header_view.xml
deleted file mode 100644
index 66d5e1b..0000000
--- a/core/res/res/layout/date_picker_header_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/date_picker_header"
- android:layout_width="@dimen/datepicker_component_width"
- android:layout_height="@dimen/datepicker_header_height"
- android:gravity="center"
- android:importantForAccessibility="no"
- android:textAllCaps="true" />
diff --git a/core/res/res/layout/date_picker_holo.xml b/core/res/res/layout/date_picker_holo.xml
index 1199a72..72030ea 100644
--- a/core/res/res/layout/date_picker_holo.xml
+++ b/core/res/res/layout/date_picker_holo.xml
@@ -20,18 +20,11 @@
android:gravity="center"
android:orientation="vertical">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <include layout="@layout/date_picker_header_view" />
-
- <include layout="@layout/date_picker_selected_date" />
- </LinearLayout>
+ <include
+ layout="@layout/date_picker_selected_date"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
<include layout="@layout/date_picker_view_animator" />
- <include layout="@layout/date_picker_done_button" />
-
</LinearLayout>
diff --git a/core/res/res/layout/date_picker_selected_date.xml b/core/res/res/layout/date_picker_selected_date.xml
index c5afddc..23ae08f 100644
--- a/core/res/res/layout/date_picker_selected_date.xml
+++ b/core/res/res/layout/date_picker_selected_date.xml
@@ -16,46 +16,53 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/day_picker_selector_layout"
- android:layout_width="@dimen/datepicker_component_width"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:paddingTop="8dip"
- android:paddingBottom="8dip"
- android:gravity="center"
- android:orientation="vertical">
+ android:id="@+id/day_picker_selector_layout"
+ android:layout_width="@dimen/datepicker_component_width"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingBottom="8dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/date_picker_header"
+ android:layout_width="@dimen/datepicker_component_width"
+ android:layout_height="@dimen/datepicker_header_height"
+ android:gravity="center"
+ android:importantForAccessibility="no"
+ android:layout_marginBottom="8dp" />
<LinearLayout
- android:id="@+id/date_picker_month_and_day_layout"
+ android:id="@+id/date_picker_month_and_day_layout"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_gravity="center"
+ android:clickable="true"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/date_picker_month"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:duplicateParentState="true"
+ android:gravity="center_horizontal|bottom" />
+
+ <TextView
+ android:id="@+id/date_picker_day"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:clickable="true"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/date_picker_month"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:duplicateParentState="true"
- android:gravity="center_horizontal|bottom" />
-
- <TextView
- android:id="@+id/date_picker_day"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="-10dip"
- android:layout_marginTop="-10dip"
- android:duplicateParentState="true"
- android:gravity="center" />
+ android:layout_marginBottom="-10dip"
+ android:layout_marginTop="-10dip"
+ android:duplicateParentState="true"
+ android:gravity="center" />
</LinearLayout>
<TextView
- android:id="@+id/date_picker_year"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:gravity="center_horizontal|top" />
+ android:id="@+id/date_picker_year"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center_horizontal|top" />
</LinearLayout>
diff --git a/core/res/res/layout/input_method_switch_dialog_title.xml b/core/res/res/layout/input_method_switch_dialog_title.xml
index d498d23..37bceb6 100644
--- a/core/res/res/layout/input_method_switch_dialog_title.xml
+++ b/core/res/res/layout/input_method_switch_dialog_title.xml
@@ -80,7 +80,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:text="@string/use_physical_keyboard"
+ android:text="@string/show_ime"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorAlertDialogListItem" />
</LinearLayout>
diff --git a/core/res/res/layout/notification_material_action.xml b/core/res/res/layout/notification_material_action.xml
index 7ccaad5..8f8c4fb 100644
--- a/core/res/res/layout/notification_material_action.xml
+++ b/core/res/res/layout/notification_material_action.xml
@@ -21,11 +21,12 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
+ android:layout_margin="0dp"
android:gravity="start|center_vertical"
android:drawablePadding="8dp"
android:paddingStart="8dp"
android:textColor="#555555"
- android:textSize="14dp"
+ android:textSize="@dimen/notification_text_size"
android:singleLine="true"
android:ellipsize="end"
/>
diff --git a/core/res/res/layout/notification_material_action_tombstone.xml b/core/res/res/layout/notification_material_action_tombstone.xml
index 8bf456e..976448b 100644
--- a/core/res/res/layout/notification_material_action_tombstone.xml
+++ b/core/res/res/layout/notification_material_action_tombstone.xml
@@ -25,7 +25,7 @@
android:drawablePadding="8dp"
android:paddingStart="8dp"
android:textColor="#555555"
- android:textSize="14dp"
+ android:textSize="@dimen/notification_text_size"
android:singleLine="true"
android:ellipsize="end"
android:alpha="0.5"
diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml
index ab13b98..5e51db9 100644
--- a/core/res/res/layout/notification_template_material_base.xml
+++ b/core/res/res/layout/notification_template_material_base.xml
@@ -29,106 +29,27 @@
/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
-
- android:layout_gravity="fill_vertical"
+ android:layout_height="match_parent"
+ android:layout_gravity="top"
+ android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/notification_large_icon_width"
android:minHeight="@dimen/notification_large_icon_height"
android:orientation="vertical"
- android:paddingEnd="8dp"
- android:paddingTop="2dp"
- android:paddingBottom="2dp"
- android:gravity="top"
>
- <LinearLayout
- android:id="@+id/line1"
+ <include layout="@layout/notification_template_part_line1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="6dp"
- android:layout_marginStart="8dp"
- android:orientation="horizontal"
- >
- <TextView android:id="@+id/title"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:layout_weight="1"
- />
- <ViewStub android:id="@+id/time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_time"
- />
- <ViewStub android:id="@+id/chronometer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_chronometer"
- />
- </LinearLayout>
- <TextView android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-2dp"
- android:layout_marginBottom="-2dp"
- android:layout_marginStart="8dp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:ellipsize="marquee"
- android:visibility="gone"
+ android:layout_weight="1"
/>
- <ProgressBar
- android:id="@android:id/progress"
- android:layout_width="match_parent"
- android:layout_height="12dp"
- android:layout_marginStart="8dp"
- android:visibility="gone"
- style="@style/Widget.StatusBar.Material.ProgressBar"
- />
- <LinearLayout
- android:id="@+id/line3"
+ <include layout="@layout/notification_template_part_line2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:layout_marginStart="8dp"
- >
- <TextView android:id="@+id/text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- />
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
- />
- <ImageView android:id="@+id/profile_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:layout_marginStart="8dp"
- android:scaleType="centerInside"
- android:visibility="gone"
- />
- </LinearLayout>
+ android:layout_weight="1"
+ />
+ <include layout="@layout/notification_template_part_line3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
</LinearLayout>
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_big_base.xml b/core/res/res/layout/notification_template_material_big_base.xml
index 0564a8f..2243a09 100644
--- a/core/res/res/layout/notification_template_material_big_base.xml
+++ b/core/res/res/layout/notification_template_material_big_base.xml
@@ -30,124 +30,24 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="fill_vertical"
+ android:layout_gravity="top"
+ android:layout_marginEnd="8dp"
+ android:layout_marginStart="@dimen/notification_large_icon_width"
android:minHeight="@dimen/notification_large_icon_height"
android:orientation="vertical"
- android:gravity="top"
>
- <LinearLayout
+ <include layout="@layout/notification_template_part_line1" />
+ <include layout="@layout/notification_template_part_line2" />
+ <TextView android:id="@+id/big_text"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/notification_large_icon_width"
android:minHeight="@dimen/notification_large_icon_height"
- android:paddingTop="2dp"
- android:orientation="vertical"
- >
- <LinearLayout
- android:id="@+id/line1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="6dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:orientation="horizontal"
- >
- <TextView android:id="@+id/title"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:layout_weight="1"
- />
- <ViewStub android:id="@+id/time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_time"
- />
- <ViewStub android:id="@+id/chronometer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_chronometer"
- />
- </LinearLayout>
- <TextView android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-2dp"
- android:layout_marginBottom="-2dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:ellipsize="marquee"
- android:visibility="gone"
- />
- <TextView android:id="@+id/big_text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="false"
- android:visibility="gone"
- />
- <LinearLayout
- android:id="@+id/line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- >
- <TextView android:id="@+id/text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- />
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
- />
- <ImageView android:id="@+id/profile_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:layout_marginStart="8dp"
- android:scaleType="centerInside"
- android:visibility="gone"
- />
- </LinearLayout>
- <ProgressBar
- android:id="@android:id/progress"
- android:layout_width="match_parent"
- android:layout_height="12dp"
- android:layout_marginBottom="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:visibility="gone"
- style="@style/Widget.StatusBar.Material.ProgressBar"
- />
- </LinearLayout>
+ android:layout_weight="1"
+ android:singleLine="false"
+ android:visibility="gone"
+ />
+ <include layout="@layout/notification_template_part_line3" />
<ImageView
android:layout_width="match_parent"
android:layout_height="1dp"
@@ -156,9 +56,10 @@
android:background="@drawable/list_divider_holo_light" />
<include
layout="@layout/notification_material_action_list"
+ android:layout_marginLeft="-8dp"
+ android:layout_marginRight="-8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/notification_large_icon_width"
/>
</LinearLayout>
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_big_picture.xml b/core/res/res/layout/notification_template_material_big_picture.xml
index 74819fd..302e651 100644
--- a/core/res/res/layout/notification_template_material_big_picture.xml
+++ b/core/res/res/layout/notification_template_material_big_picture.xml
@@ -40,13 +40,13 @@
/>
<include layout="@layout/notification_template_material_base"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="64dp"
/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="208dp"
- android:paddingStart="64dp"
+ android:paddingStart="@dimen/notification_large_icon_width"
android:layout_gravity="bottom"
android:background="#CCEEEEEE"
>
diff --git a/core/res/res/layout/notification_template_material_big_text.xml b/core/res/res/layout/notification_template_material_big_text.xml
deleted file mode 100644
index 1de5add..0000000
--- a/core/res/res/layout/notification_template_material_big_text.xml
+++ /dev/null
@@ -1,179 +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
- -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:internal="http://schemas.android.com/apk/prv/res/android"
- android:id="@+id/status_bar_latest_event_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- internal:layout_minHeight="65dp"
- internal:layout_maxHeight="unbounded"
- >
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="fill_vertical"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:orientation="vertical"
- android:paddingTop="0dp"
- android:paddingBottom="2dp"
- android:gravity="top"
- >
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="@dimen/notification_large_icon_height"
- android:orientation="vertical"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:layout_weight="1"
- >
- <LinearLayout
- android:id="@+id/line1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:orientation="horizontal"
- android:layout_gravity="top"
- android:layout_weight="0"
- >
- <TextView android:id="@+id/title"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:layout_weight="1"
- />
- <ViewStub android:id="@+id/time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_time"
- />
- <ViewStub android:id="@+id/chronometer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_chronometer"
- />
- </LinearLayout>
- <TextView android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-2dp"
- android:layout_marginBottom="-2dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:ellipsize="marquee"
- android:layout_weight="0"
- android:visibility="gone"
- />
- <ProgressBar
- android:id="@android:id/progress"
- android:layout_width="match_parent"
- android:layout_height="12dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:visibility="gone"
- android:layout_weight="0"
- style="@style/Widget.StatusBar.Material.ProgressBar"
- />
- <TextView android:id="@+id/big_text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginBottom="10dp"
- android:layout_marginEnd="8dp"
- android:singleLine="false"
- android:visibility="gone"
- android:maxLines="8"
- android:ellipsize="end"
- android:layout_weight="1"
- />
- </LinearLayout>
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:id="@+id/action_divider"
- android:visibility="gone"
- android:background="@drawable/list_divider_holo_light" />
- <include
- layout="@layout/notification_material_action_list"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:id="@+id/overflow_divider"
- android:layout_marginBottom="8dp"
- android:visibility="visible"
- android:background="@drawable/list_divider_holo_light" />
- <LinearLayout
- android:id="@+id/line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:orientation="horizontal"
- android:layout_weight="0"
- android:gravity="center_vertical"
- >
- <TextView android:id="@+id/text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- />
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
- />
- <ImageView android:id="@+id/profile_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:layout_marginStart="8dp"
- android:scaleType="centerInside"
- android:visibility="gone"
- />
- </LinearLayout>
- </LinearLayout>
-</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_inbox.xml b/core/res/res/layout/notification_template_material_inbox.xml
index 8411ff5..6133791 100644
--- a/core/res/res/layout/notification_template_material_inbox.xml
+++ b/core/res/res/layout/notification_template_material_inbox.xml
@@ -30,175 +30,93 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="fill_vertical"
+ android:layout_gravity="top"
android:layout_marginStart="@dimen/notification_large_icon_width"
android:minHeight="@dimen/notification_large_icon_height"
android:orientation="vertical"
- android:paddingTop="0dp"
- android:paddingBottom="2dp"
- android:gravity="top"
>
- <LinearLayout
+ <include layout="@layout/notification_template_part_line1" />
+ <include layout="@layout/notification_template_part_line2" />
+ <TextView android:id="@+id/inbox_text0"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="@dimen/notification_large_icon_height"
- android:paddingTop="2dp"
- android:orientation="vertical"
- >
- <LinearLayout
- android:id="@+id/line1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:paddingTop="6dp"
- android:orientation="horizontal"
- android:layout_weight="0"
- >
- <TextView android:id="@+id/title"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:layout_weight="1"
- />
- <ViewStub android:id="@+id/time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_time"
- />
- <ViewStub android:id="@+id/chronometer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_chronometer"
- />
- </LinearLayout>
- <TextView android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-2dp"
- android:layout_marginBottom="-2dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:ellipsize="marquee"
- android:visibility="gone"
- android:layout_weight="0"
- />
- <ProgressBar
- android:id="@android:id/progress"
- android:layout_width="match_parent"
- android:layout_height="12dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:visibility="gone"
- android:layout_weight="0"
- style="@style/Widget.Material.Light.ProgressBar.Horizontal"
- />
- <TextView android:id="@+id/inbox_text0"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text1"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text2"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text3"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text4"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text5"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_text6"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <TextView android:id="@+id/inbox_more"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- android:text="@android:string/ellipsis"
- />
- <FrameLayout
- android:id="@+id/inbox_end_pad"
- android:layout_width="match_parent"
- android:layout_height="8dip"
- android:visibility="gone"
- android:layout_weight="0"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
/>
- </LinearLayout>
+ <TextView android:id="@+id/inbox_text1"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_text2"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_text3"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_text4"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_text5"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_text6"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ />
+ <TextView android:id="@+id/inbox_more"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:visibility="gone"
+ android:layout_weight="1"
+ android:text="@android:string/ellipsis"
+ />
+ <FrameLayout
+ android:id="@+id/inbox_end_pad"
+ android:layout_width="match_parent"
+ android:layout_height="8dip"
+ android:visibility="gone"
+ android:layout_weight="0"
+ />
<ImageView
android:layout_width="match_parent"
android:layout_height="1dip"
@@ -209,6 +127,8 @@
layout="@layout/notification_material_action_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginLeft="-8dp"
+ android:layout_marginRight="-8dp"
android:layout_weight="0"
/>
<ImageView
@@ -217,47 +137,6 @@
android:id="@+id/overflow_divider"
android:visibility="visible"
android:background="@drawable/list_divider_holo_light" />
- <LinearLayout
- android:id="@+id/line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:orientation="horizontal"
- android:layout_weight="0"
- android:gravity="center_vertical"
- >
- <TextView android:id="@+id/text"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- />
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
- />
- <ImageView android:id="@+id/profile_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:layout_marginStart="8dp"
- android:scaleType="centerInside"
- android:visibility="gone"
- />
- </LinearLayout>
+ <include layout="@layout/notification_template_part_line3" />
</LinearLayout>
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_part_line1.xml b/core/res/res/layout/notification_template_part_line1.xml
new file mode 100644
index 0000000..d652959
--- /dev/null
+++ b/core/res/res/layout/notification_template_part_line1.xml
@@ -0,0 +1,49 @@
+<?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:id="@+id/line1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/notification_vert_pad"
+ android:layout_weight="0"
+ >
+ <TextView android:id="@+id/title"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:layout_weight="1"
+ />
+ <ViewStub android:id="@+id/time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:visibility="gone"
+ android:layout="@layout/notification_template_part_time"
+ />
+ <ViewStub android:id="@+id/chronometer"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:visibility="gone"
+ android:layout="@layout/notification_template_part_chronometer"
+ />
+</LinearLayout>
diff --git a/core/res/res/layout/notification_template_part_line2.xml b/core/res/res/layout/notification_template_part_line2.xml
new file mode 100644
index 0000000..1e19df1
--- /dev/null
+++ b/core/res/res/layout/notification_template_part_line2.xml
@@ -0,0 +1,40 @@
+<?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
+ -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <TextView
+ android:id="@+id/text2"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-2dp"
+ android:layout_marginBottom="-2dp"
+ android:singleLine="true"
+ android:fadingEdge="horizontal"
+ android:ellipsize="marquee"
+ android:visibility="gone"
+ android:layout_weight="0"
+ />
+ <ProgressBar
+ android:id="@android:id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:visibility="gone"
+ android:layout_weight="0"
+ style="@style/Widget.Material.Light.ProgressBar.Horizontal"
+ />
+</merge>
diff --git a/core/res/res/layout/notification_template_part_line3.xml b/core/res/res/layout/notification_template_part_line3.xml
new file mode 100644
index 0000000..2c8c704c
--- /dev/null
+++ b/core/res/res/layout/notification_template_part_line3.xml
@@ -0,0 +1,56 @@
+<?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:id="@+id/line3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_weight="0"
+ android:gravity="center_vertical"
+ android:paddingBottom="@dimen/notification_vert_pad"
+ >
+ <TextView android:id="@+id/text"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ />
+ <TextView android:id="@+id/info"
+ android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_weight="0"
+ android:singleLine="true"
+ android:gravity="center"
+ android:paddingStart="8dp"
+ />
+ <ImageView android:id="@+id/profile_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:layout_weight="0"
+ android:layout_marginStart="8dp"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ />
+</LinearLayout>
diff --git a/core/res/res/layout/preference_widget_switch.xml b/core/res/res/layout/preference_widget_switch.xml
index 7395ff2..25e8aa6 100644
--- a/core/res/res/layout/preference_widget_switch.xml
+++ b/core/res/res/layout/preference_widget_switch.xml
@@ -21,4 +21,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
+ android:clickable="false"
android:background="@null" />
diff --git a/core/res/res/layout/select_dialog_multichoice_material.xml b/core/res/res/layout/select_dialog_multichoice_material.xml
index 8b4c59d..01e4cfa 100644
--- a/core/res/res/layout/select_dialog_multichoice_material.xml
+++ b/core/res/res/layout/select_dialog_multichoice_material.xml
@@ -26,4 +26,5 @@
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+ android:checkMarkGravity="start"
android:ellipsize="marquee" />
diff --git a/core/res/res/layout/select_dialog_singlechoice_material.xml b/core/res/res/layout/select_dialog_singlechoice_material.xml
index 27a6648..0f3c277 100644
--- a/core/res/res/layout/select_dialog_singlechoice_material.xml
+++ b/core/res/res/layout/select_dialog_singlechoice_material.xml
@@ -26,4 +26,5 @@
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:checkMark="?android:attr/listChoiceIndicatorSingle"
+ android:checkMarkGravity="start"
android:ellipsize="marquee" />
diff --git a/core/res/res/layout/time_header_label.xml b/core/res/res/layout/time_header_label.xml
index 45c6241..5c97040 100644
--- a/core/res/res/layout/time_header_label.xml
+++ b/core/res/res/layout/time_header_label.xml
@@ -14,20 +14,21 @@
~ 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/time_header"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center" >
-
- <TextView
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/time_header"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
android:id="@+id/hours"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/separator"
- android:layout_alignBaseline="@+id/separator"/>
-
- <TextView
+ android:layout_alignBaseline="@+id/separator" />
+ <TextView
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -35,15 +36,13 @@
android:paddingRight="@dimen/timepicker_separator_padding"
android:layout_centerInParent="true"
android:importantForAccessibility="no" />
-
- <TextView
+ <TextView
android:id="@+id/minutes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/separator"
android:layout_alignBaseline="@+id/separator" />
-
- <TextView
+ <TextView
android:id="@+id/ampm_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -51,5 +50,5 @@
android:paddingRight="@dimen/timepicker_ampm_left_padding"
android:layout_toRightOf="@+id/separator"
android:layout_alignBaseline="@+id/separator" />
-
-</RelativeLayout>
+ </RelativeLayout>
+</FrameLayout>
diff --git a/core/res/res/layout/time_picker_dialog.xml b/core/res/res/layout/time_picker_dialog.xml
index 09326c8..30fe910 100644
--- a/core/res/res/layout/time_picker_dialog.xml
+++ b/core/res/res/layout/time_picker_dialog.xml
@@ -21,5 +21,4 @@
android:id="@+id/timePicker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
+ android:layout_height="wrap_content" />
diff --git a/core/res/res/layout/time_picker_holo.xml b/core/res/res/layout/time_picker_holo.xml
index 0890fe5..483eb6d 100644
--- a/core/res/res/layout/time_picker_holo.xml
+++ b/core/res/res/layout/time_picker_holo.xml
@@ -34,21 +34,4 @@
android:layout_gravity="center"
android:focusable="true"
android:focusableInTouchMode="true" />
- <LinearLayout
- android:id="@+id/layout_buttons"
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning">
- <Button
- android:id="@+id/done_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:text="@string/done_label"
- android:textSize="@dimen/timepicker_done_label_size"
- style="?android:attr/buttonBarButtonStyle" />
- </LinearLayout>
</LinearLayout>
diff --git a/core/res/res/layout/time_picker_legacy_leanback.xml b/core/res/res/layout/time_picker_legacy_leanback.xml
deleted file mode 100644
index 397f733..0000000
--- a/core/res/res/layout/time_picker_legacy_leanback.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/timePickerLayout"
- android:orientation="horizontal"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingStart="8dip"
- android:paddingEnd="8dip">
-
- <LinearLayout android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingStart="8dip"
- android:paddingEnd="8dip"
- android:layoutDirection="ltr">
-
- <!-- hour -->
- <NumberPicker
- android:id="@+id/hour"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
- <!-- divider -->
- <TextView
- android:id="@+id/divider"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="6dip"
- android:layout_marginEnd="6dip"
- android:layout_gravity="center_vertical"
- android:importantForAccessibility="no"
- />
-
- <!-- minute -->
- <NumberPicker
- android:id="@+id/minute"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
- </LinearLayout>
-
- <!-- AM / PM -->
- <NumberPicker
- android:id="@+id/amPm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:layout_marginStart="8dip"
- android:layout_marginEnd="8dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
- <!-- Width fixed here because TextView doesn't set MEASURED_STATE_TOO_SMALL -->
- <Button
- android:id="@+id/done_button"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/done_label"
- android:textSize="@dimen/timepicker_done_label_size"
- style="?android:attr/buttonBarButtonStyle" />
-
-</LinearLayout>
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index a67ad02..45a392b 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Laat die program toe om toegang tot eksterne berging vir alle gebruikers te verkry."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"lees die kaslêerstelsel"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Laat die program toe om die kaslêerstelsel te lees en skryf."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"maak en/of ontvang SIP-oproepe"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Laat die program toe om SIP-oproepe te maak en te ontvang."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"beleef interaksie met in-oproep-skerm"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Laat die program beheer wanneer en hoe die gebruiker die in-oproep-skerm sien."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lees netwerkgebruik-geskiedenis"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Laat die program toe om historiese netwerkgebruik vir spesifieke netwerke en programme te lees."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"bestuur netwerkbeleid"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> gekies"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> uitgevee"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Werk-<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Jy is in sluit-na-program-modus. Raak en hou die knoppie vir onlangse programme om uit te gaan"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Jy is in Sluit-na-program-modus."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Gebruik Sluit-na-program?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Sluit-na-program sluit die skerm in \'n enkele program.\n\nRaak en hou die knoppie vir onlangse programme om uit te gaan."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEE, DANKIE"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"BEGIN"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Gesluit na program"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Nie meer gesluit na program nie"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Vra om %1$s voordat uitgegaan word"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ontsluitpatroon"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"wagwoord"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Die TV-ouerriglyne"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Suggestiewe dialoog (beteken gewoonlik praatjies oor seks)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Vulgêre taal"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuele inhoud"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Geweld"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasiegeweld (net kinderprogramme)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index dcfd8e5..91f777d 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"መተግበሪያውን የሁሉም ተጠቃሚዎች ውጫዊ ማከማቻውን እንዲደርስ ይፈቅድለታል።"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"የመሸጎጫ ስርዓተ ፋይል ድረስ"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"መሸጎጫ ስርዓተ ፋይል ለማንበብ እና ለመፃፍ ለመተግበሪያው ይፈቅዳሉ።"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"የSIP ጥሪዎችን ያድርጉ/ይቀበሉ"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"መተግበሪያው የSIP ጥሪዎችን እንዲያደር እና እንዲቀበል ያስችላል።"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ከጥሪ ውስጥ ማያ ገጽ ጋር ይገናኝ"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"መተግበሪያው ተጠቃሚው በጥሪ ውስጥ ያለውን ማያ ገጽ መቼ እና እንዴት ማየት እንደሚችል እንዲቆጣጠር ይፈቅድለታል።"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"የታሪካዊ አውታረመረብ አጠቃቀም አንብብ"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"የተወሰኑ የአውታረ መረቦች እና ትግበራዎችን ታሪካዊ የአውታረመረብ አጠቃቀም ለማንበብ ለመተግበሪያው ይፈቅዳሉ፡፡"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"የአውታረ መረብ መምሪያ አደራጅ"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ተመርጧል"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ተሰርዟል"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"ስራ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"ከመተግበሪያ-እዚህ-ቆልፍ ሁነታ ላይ ነው ያሉት። ለመውጣት የቅርብ ጊዜዎች አዝራሩን ተጭነው ይያዙ።"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"ከመተግበሪያ-እዚህ-ቆልፍ ሁነታ ላይ ነው ያሉት።"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"መተግበሪያ-እዚህ-ቆልፍን ይጠቀም?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"መተግበሪያ-ጋር-ቆልፍ ማሳያውን በአንዲት መተግበሪያ ላይ ይቆልፈዋል።\n\nለመውጣት የቅርብ ጊዜዎች አዝራሩን ተጭነው ይያዙት።"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"አይ፣ አመሰግናለሁ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ጀምር"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"ከመተግበሪያ ጋር ተቆልፏል"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"ከአሁን በኋላ ከመተግበሪያው ጋር አልተቆለፈም"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"ከመውጣት በፊት %1$s ጠይቅ"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"ፒን"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"የማስከፈቻ ስርዓተ-ጥለት"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"የይለፍ ቃል"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"የቴሌቪዥን ወላጅ መመሪያዎች"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ግልጽ ንግግር (አብዛኛው ጊዜ ስለወሲብ ይነጋገራሉ ማለት ነው)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ደረቅ ቋንቋ"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"ወሲባዊ ይዘት"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ጥቃት"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ምናባዊ ጥቃት (የልጆች ፕሮግራም ብቻ)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index 3e0d488..e0cd94c 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"للسماح للتطبيق بإجراء مكالمات SIP وتلقيها."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"التفاعل مع الشاشة أثناء الاتصال"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"للسماح للتطبيق بالتحكم في وقت وكيفية مشاهدة المستخدم للشاشة أثناء الاتصال."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"قراءة بيانات الاستخدام السابقة للشبكة"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"للسماح للتطبيق بقراءة معلومات سابقة عن استخدام الشبكة لشبكات وتطبيقات محددة."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"إدارة سياسة الشبكة"</string>
@@ -1760,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"تم تحديد <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"تم حذف <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> المخصص للعمل"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"أنت في وضع التقييد بتطبيق. للخروج، المس مع الاستمرار زر \"التطبيقات الأخيرة\""</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"أنت في وضع \"التقييد بتطبيق\"."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"هل تريد استخدام ميزة التقييد بتطبيق؟"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"تؤدي ميزة التقييد بتطبيق إلى قفل الشاشة على تطبيق واحد.\n\nللخروج من هذا الوضع، المس مع الاستمرار زر \"التطبيقات الأخيرة\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"لا، شكرًا"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"بدء"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"تم التقييد بتطبيق"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"لم تعد في وضع التقييد بتطبيق"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"المطالبة بـ %1$s قبل الخروج"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"رقم التعريف الشخصي"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"نقش إلغاء القفل"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"كلمة المرور"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"إرشادات المراقبة الأبوية على المحتوى التلفزيوني"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"حوار موحي جنسيًا (يتحدث عادة عن الجنس)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"لغة غليظة"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"محتوى جنسي"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"العنف"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"العنف الخيالي (برامج الأطفال فقط)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index d9d60dd..51d11c6 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Разрешава на приложението достъп до външното хранилище за всички потребители."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"достъп до файловата система на кеша"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Разрешава на приложението да чете и записва във файловата система на кеша."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"извършване/получаване на обаждания чрез SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Разрешава на приложението да извършва и получава обаждания чрез SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"взаимодействие с екрана за обаждане"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Разрешава на приложението да контролира кога и как потребителят вижда екрана за обаждане."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"четене на употребата на мрежата до момента"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Разрешава на приложението да чете употребата на данни за конкретни мрежи и приложения до момента."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"управление на правилата на мрежата"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Избрахте <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Изтрихте <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> за работа"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Режимът на заключване в приложението е включен. За изход докоснете и задръжте бутона „Скорошни“"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Режимът на заключване в приложението е включен."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Да се използва ли „Заключване в приложението“?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Със „Заключване в приложението“ екранът се заключва в едно приложение.\n\nЗа изход докоснете и задръжте бутона „Скорошни“."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"НЕ, БЛАГОДАРЯ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"СТАРТИРАНЕ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Заключването в приложението е активно"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Заключването в приложението вече не е активно"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Изискване на %1$s преди изход"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"ПИН код"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"фигура за отключване"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"парола"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Телевизионни указания за родители"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Диалог, предизвикващ неприлични асоциации (обикновено означава разговори за секс)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Груб език"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Сексуално съдържание"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Насилие"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Въображаемо насилие (само програми за деца)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml
index 03fdac0..c288ab1 100644
--- a/core/res/res/values-bn-rBD/strings.xml
+++ b/core/res/res/values-bn-rBD/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"অ্যাপ্লিকেশানটিকে সমস্ত ব্যবহারকারীর জন্য বহিরাগত সংগ্রহস্থল অ্যাক্সেস করার অনুমতি দেয়৷"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"ক্যাশে ফাইল সিস্টেম অ্যাক্সেস করে"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ক্যাশে ফাইল সিস্টেম পড়তে ও লিখতে অ্যাপ্লিকেশানকে অনুমতি দেয়৷"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP কল করুন/গ্রহণ করুন"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"অ্যাপ্লিকেশানকে SIP কল করতে ও গ্রহণ করতে অনুমতি দেয়।"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"কলে-থাকা স্ক্রীণের সাথে ইন্টারঅ্যাক্ট করে"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"কখন এবং কীভাবে ব্যবহারকারী কলে-থাকা স্ক্রীণটিকে দেখতে পাবেন অ্যাপ্লিকেশানটিকে তা নিয়ন্ত্রণ করতে দেয়৷"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"তারিখ অনুযায়ী নেটওয়ার্কের ব্যবহার পড়ে"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"অ্যাপ্লিকেশানটিকে নিদিষ্ট নেটওয়ার্ক এবং অ্যাপ্লিকেশানগুলির জন্য পূর্বের নেটওয়ার্কের ব্যবহার পড়তে দেয়৷"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"নেটওয়ার্ক নীতি পরিচালনা করে"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> নির্বাচন করা হয়েছে"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> মুছে ফেলা হয়েছে"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"কর্মক্ষেত্র <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"আপনি লক-টু-অ্যাপ মোডে আছেন। এটি থেকে বেরিয়ে যেতে ‘সাম্প্রতিকগুলি’ বোতাম স্পর্শ করে ধরে রাখুন"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"আপনি অ্যাপ-এ-লক করুন মোডে রয়েছেন৷"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"অ্যাপ-এ-লক ব্যবহার করতে চান?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"লক-টু-অ্যাপ কোনো একক অ্যাপ্লিকেশানে প্রদর্শন লক করে।\n \nএটি থেকে বেরিয়ে যেতে ‘সাম্প্রতিকগুলি’ বোতাম স্পর্শ করে ধরে রাখুন।"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"না, থাক"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"চালু করুন"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"অ্যাপ্লিকেশানে লক করা আছে"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"আর অ্যাপ্লিকেশানে লক করা নেই"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"প্রস্থান করার পূর্বে %1$s এর কথা জিজ্ঞাসা করুন"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"আনলক প্যাটার্ন"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"পাসওয়ার্ড"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"টেলিভিশনের জন্য অভিভাবক নির্দেশিকা"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ইঙ্গিতপূর্ণ সংলাপ (সাধারণত বোঝায় যে এতে যৌনতা বিষয়ে আলোচনা আছে)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"অমার্জিত ভাষা"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"যৌন সামগ্রী"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"হিংস্রতা"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ফ্যান্টাসি হিংস্রতা (শুধুমাত্র শিশুদের প্রোগ্রামগুলির জন্য)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index d0ecfb3..510c772 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permet que l\'aplicació accedeixi a l\'emmagatzematge extern per a tots els usuaris."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"accedir al sistema de fitxers de la memòria cau"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permet que l\'aplicació llegeixi el sistema de fitxers de la memòria cau i que hi escrigui."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"Fer i rebre trucades de SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permet que l\'aplicació pugui fer i rebre trucades de SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interacciona amb la pantalla de la trucada"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permet que l\'aplicació controli quan i com l\'usuari veu la pantalla de la trucada."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lectura de l\'ús històric de la xarxa"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permet que l\'aplicació llegeixi l\'ús històric de la xarxa per a xarxes i per a aplicacions específiques."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gestió de la política de xarxa"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> seleccionat"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> suprimit"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de la feina"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Estàs en mode de bloqueig d\'aplicació. Per sortir-ne, toca i mantén premut el botó Recents."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Estàs en el mode de Bloqueig d\'aplicació."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Vols fer servir la funció Bloqueig d\'aplicació?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Amb Bloqueig d\'aplicació es bloqueja la pantalla en una única aplicació.\n\nPer sortir-ne, toca i mantén premut el botó Recents."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, GRÀCIES"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INICI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"En Bloqueig d\'aplicació"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Fora del Bloqueig d\'aplicació"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Demana %1$s abans de sortir"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"patró de desbloqueig"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"contrasenya"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Directrius de TV per als pares"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diàlegs suggeridors (normalment es refereix a converses sobre sexe)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Llenguatge vulgar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contingut sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violència"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violència fantàstica (nomes per a la programació infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 44611d7..7bab386 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Umožňuje aplikaci přistupovat k externímu úložišti pro všechny uživatele."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"přistupovat do souborového systému mezipaměti"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Umožňuje aplikaci číst a zapisovat do souborového systému mezipaměti."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"uskutečňování/příjem volání SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Povolí aplikaci uskutečňovat a přijímat volání SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakce s obrazovkou příchozího hovoru"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Umožňuje aplikaci řídit, kdy a jak se uživateli zobrazí obrazovka příchozího hovoru."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"číst využití sítě v historii"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Umožňuje aplikaci číst historii využití sítě (u určitých sítí a aplikací)."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"spravovat zásady sítě"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Vybrána položka <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Číslice <xliff:g id="KEY">%1$s</xliff:g> byla smazána"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Pracovní <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Nacházíte se v režimu Uzamčení v aplikaci. Chcete-li tento režim opustit, stiskněte a podržte tlačítko posledních aplikací."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Nacházíte se v režimu Uzamčení v aplikaci."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Použít Uzamčení v aplikaci?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Funkce Uzamčení v aplikaci uzamkne obrazovku na jedinou aplikaci.\n\nChcete-li tento režim opustit, stiskněte a podržte tlačítko posledních aplikací."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NE, DĚKUJI"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"SPUSTIT"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Uzamčeno v aplikaci"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Uzamčení v aplikaci bylo ukončeno"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Před ukončením požádat o %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"bezpečnostní gesto"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"heslo"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"The TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Obscénní dialogy (tématem bývá sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Hrubá mluva"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Erotický obsah"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Násilí"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fiktivní násilí (pouze v programech pro děti)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 17e08d4..c0351bc 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -419,7 +419,7 @@
<string name="permdesc_bindDeviceAdmin" msgid="569715419543907930">"Tillader, at brugeren kan sende hensigter til en enhedsadministrator. Dette bør aldrig være nødvendigt for almindelige apps."</string>
<string name="permlab_bindTvInput" msgid="5601264742478168987">"knyt til en tv-indgang"</string>
<string name="permdesc_bindTvInput" msgid="2371008331852001924">"Giver indehaveren mulighed for at knytte sig til det øverste grænsefladeniveau for en tv-indgang. Dette bør ikke være nødvendigt i normale apps."</string>
- <string name="permlab_modifyParentalControls" msgid="4611318225997592242">"rediger forældrekontrol"</string>
+ <string name="permlab_modifyParentalControls" msgid="4611318225997592242">"redigere forældrekontrol"</string>
<string name="permdesc_modifyParentalControls" msgid="7438482894162282039">"Giver indehaveren mulighed for at ændre systemdataene for forældrekontrol. Dette bør ikke være nødvendigt for almindelige apps."</string>
<string name="permlab_manageDeviceAdmins" msgid="4248828900045808722">"tilføje eller fjerne en enhedsadministrator"</string>
<string name="permdesc_manageDeviceAdmins" msgid="5025608167709942485">"Tillader, at man tilføjer eller fjerner aktive enhedsadministratorer. Dette burde aldrig være nødvendigt til normale apps."</string>
@@ -664,9 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"tillader Bluetooth-parring efter applikation"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Tillader, at appen parrer med eksterne enheder uden brugerinteraktion."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Tillader, at appen parrer med eksterne enheder uden brugerinteraktion."</string>
- <string name="permlab_bluetoothMap" msgid="6372198338939197349">"adgang til Bluetooth-kortdata"</string>
- <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Tillader, at appen får adgang til Bluetooth-kortdata."</string>
- <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Tillader, at appen får adgang til Bluetooth-kortdata."</string>
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"adgang til Bluetooth-MAP-data"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Tillader, at appen får adgang til Bluetooth-MAP-data."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Tillader, at appen får adgang til Bluetooth-MAP-data."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"tilslut og afbryd fra WiMAX"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Tillader, at appen kan fastslå, hvorvidt WiMAX er aktiveret, og oplysninger om eventuelle WiMAX-netværk, der er forbundet."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Skift WiMAX-tilstand"</string>
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Tillader, at appen får adgang til eksterne lagre for alle brugere."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"få adgang til cache-filsystemet"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Tillader, at appen kan læse og skrive i cachefilsystemet."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"foretage/modtage SIP-opkald"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Tillader, at appen foretager og modtager SIP-opkald."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interager med skærmen for indgående opkald"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Tillader, at appen styrer, hvornår og hvordan brugeren ser skærmen for indgående opkald."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"læse oversigt over netværksbrug"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Tillader, at appen kan læse historisk netværksbrug for specifikke netværk og apps."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"administrer netværkspolitik"</string>
@@ -744,8 +746,8 @@
<string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"Tillader, at en applikation leverer og anvender DRM-certfikater. Dette bør aldrig være nødvendigt for almindelige apps."</string>
<string name="permlab_handoverStatus" msgid="1159132046126626731">"Modtag staus for Android Beam-overførsler"</string>
<string name="permdesc_handoverStatus" msgid="4788144087245714948">"Tillader, at applikationen modtager oplysninger om aktuelle Android Beam-overførsler"</string>
- <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"fjern DRM-certifikater"</string>
- <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Tillader, at en applikation fjerner DRM-certifikater. Dette bør aldrig være nødvendigt for almindelige apps."</string>
+ <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"fjerne DRM-certifikater"</string>
+ <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Tillader, at en app fjerner DRM-certifikater. Dette bør aldrig være nødvendigt for almindelige apps."</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"Indstil regler for adgangskode"</string>
<string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller længden samt tilladte tegn i adgangskoder til oplåsning af skærmen."</string>
<string name="policylab_watchLogin" msgid="914130646942199503">"Overvåg forsøg på oplåsning af skærm"</string>
@@ -1568,7 +1570,7 @@
<string name="SetupCallDefault" msgid="5834948469253758575">"Vil du besvare opkaldet?"</string>
<string name="activity_resolver_use_always" msgid="8017770747801494933">"Altid"</string>
<string name="activity_resolver_use_once" msgid="2404644797149173758">"Kun én gang"</string>
- <string name="activity_resolver_work_profiles_support" msgid="5462991471861024343">"%1$s understøtter ikke Work-profilen."</string>
+ <string name="activity_resolver_work_profiles_support" msgid="5462991471861024343">"%1$s understøtter ikke arbejdsprofilen."</string>
<string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Tablet"</string>
<string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string>
<string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Hovedtelefoner"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> er valgt"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> er slettet"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> – arbejde"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Du er i tilstanden Bliv i app. For at afslutte tilstanden skal du trykke på knappen Seneste og holde knappen nede"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Du bruger tilstanden Lås-til-app."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Vil du bruge Bliv i app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Bliv i app låser skærmen i en enkelt app.\n\nFor at afslutte tilstanden skal du trykke på knappen Seneste og holde den nede."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEJ TAK"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Bliv i app startes"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Bliv i app afsluttes"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Bed om %1$s, før du afslutter"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Pinkode"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"oplåsningsmønster"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"adgangskode"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Tv-retningslinjer for forældre"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialog om seksuelt orienteret materiale (henviser normalt til snak om sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Groft sprogbrug"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuelt indhold"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Vold"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasy-vold (kun i børneprogrammer)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 361589b..e45ce8a 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -664,7 +664,7 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"Bluetooth-Pairing nach jeweiliger App ermöglichen"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Ermöglicht der App, Pairing mit Remote-Geräten ohne Eingriff des Nutzers durchzuführen"</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Ermöglicht der App, Pairing mit Remote-Geräten ohne Eingriff des Nutzers durchzuführen"</string>
- <string name="permlab_bluetoothMap" msgid="6372198338939197349">"A uf Bluetooth-MAP-Daten zugreifen"</string>
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"Auf Bluetooth-MAP-Daten zugreifen"</string>
<string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Ermöglicht der App, auf Bluetooth-MAP-Daten zuzugreifen"</string>
<string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Ermöglicht der App, auf Bluetooth-MAP-Daten zuzugreifen"</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX-Verbindungen herstellen und trennen"</string>
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Ermöglicht der App, auf externen Speicher aller Nutzer zuzugreifen."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"Auf das Cache-Dateisystem zugreifen"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Ermöglicht der App Lese- und Schreibzugriff auf das Cache-Dateisystem"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP-Anrufe tätigen/empfangen"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ermöglicht der App das Tätigen und Empfangen von SIP-Anrufen"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"Mit Anrufbildschirm interagieren"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Die App kann steuern, wann und wie der Nutzer den Anrufbildschirm sieht."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"Bisherige Netzwerkauslastung lesen"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Ermöglicht der App, Daten zur bisherigen Netzwerkauslastung für bestimmte Netzwerke und Apps zu lesen"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"Netzwerkrichtlinien verwalten"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ausgewählt"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> gelöscht"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (geschäftlich)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Sie befinden sich im App-Verriegelungsmodus. Um die Funktion zu beenden, berühren und halten Sie die Schaltfläche \"Neueste\"."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Sie befinden sich im App-Verriegelungsmodus."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"App-Verriegelung verwenden?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Die App-Verriegelung sperrt den Bildschirm einer einzelnen App.\n\nUm die Funktion zu beenden, berühren und halten Sie die Schaltfläche \"Neueste\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"Nein danke"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"Starten"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"App-Verriegelung aktiviert"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"App-Verriegelung aufgehoben"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Vor dem Beenden \"%1$s\" fragen"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"Entsperrungsmuster"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"Passwort"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV Parental Guidelines – Jugendschutzhinweise"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Anzügliche Dialoge (meist Gespräche über Sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Derbe Sprache"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Pornografische Inhalte"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Gewalt"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Gewaltdarstellungen im Fantasygenre (nur Kinderprogramm)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index af8d9d6..b3db37d 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Επιτρέπει στην εφαρμογή να πραγματοποιεί και να λαμβάνει κλήσεις SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"αλληλεπίδραση με την οθόνη κατά τη διάρκεια κλήσης"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Επιτρέπει στην εφαρμογή να ελέγχει πότε και πώς βλέπει ο χρήστης την οθόνη κατά τη διάρκεια κλήσης."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ανάγνωση ιστορικών δεδομένων χρήσης δικτύου"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Επιτρέπει στην εφαρμογή την ανάγνωση ιστορικών στοιχείων χρήσης δικτύου για συγκεκριμένα δίκτυα και εφαρμογές."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"διαχείριση πολιτικής δικτύου"</string>
@@ -1760,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Επιλέχτηκε το στοιχείο <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> διαγράφηκε"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Εργασία <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Βρίσκεστε στη λειτουργία Lock-to-App. Για έξοδο, πατήστε παρατεταμένα το κουμπί \"Πρόσφατες\""</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Βρίσκεστε στη λειτουργία Lock-to-App."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Χρήση λειτουργίας lock-to-app;"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Η λειτουργία Lock-to-app κλειδώνει την οθόνη σε μία μόνο εφαρμογή.\n\nΓια έξοδο, αγγίξτε παρατεταμένα το κουμπί \"Πρόσφατες\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ΟΧΙ, ΕΥΧΑΡΙΣΤΩ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ΕΝΑΡΞΗ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Η λειτουργία Lock-to-app είναι ενεργή"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Η λειτουργία Lock-to-app δεν είναι ενεργή πλέον"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Να γίνεται ερώτηση για %1$s πριν από την έξοδο"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Αριθμός PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"μοτίβο ξεκλειδώματος"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"κωδικός πρόσβασης"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Τηλεοπτική σήμανση"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Διάλογος με υπονοούμενα (Συνήθως αφορά συζητήσεις σχετικά με το σεξ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Χυδαία γλώσσα"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Σεξουαλικό περιεχόμενο"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Βία"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Βία φαντασίας (Μόνο για προγραμματισμό περιεχομένου για παιδιά)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 9585e74..3e2d93e 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Allows the app to make and receive SIP calls."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interact with in-call screen"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Allows the app to control when and how the user sees the in-call screen."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"read historical network usage"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Allows the app to read historical network usage for specific networks and apps."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"manage network policy"</string>
@@ -1760,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"You are in lock-to-app mode. To exit, touch and hold the Recents button"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"You are in Lock-to-App mode."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Use Lock-to-app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Lock-to-app locks the display in a single app.\n\nTo exit, touch and hold the Recents button."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, THANKS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Locked to app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"No longer locked to app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Ask for %1$s before exiting"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"unlock pattern"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"password"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"The TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Suggestive dialogue (Usually means talks about sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Coarse language"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Sexual content"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violence"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasy violence (Children\'s programming only)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 9585e74..3e2d93e 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Allows the app to make and receive SIP calls."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interact with in-call screen"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Allows the app to control when and how the user sees the in-call screen."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"read historical network usage"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Allows the app to read historical network usage for specific networks and apps."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"manage network policy"</string>
@@ -1760,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"You are in lock-to-app mode. To exit, touch and hold the Recents button"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"You are in Lock-to-App mode."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Use Lock-to-app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Lock-to-app locks the display in a single app.\n\nTo exit, touch and hold the Recents button."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, THANKS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Locked to app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"No longer locked to app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Ask for %1$s before exiting"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"unlock pattern"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"password"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"The TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Suggestive dialogue (Usually means talks about sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Coarse language"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Sexual content"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violence"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasy violence (Children\'s programming only)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 87d163e8..d321412 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"Identificador de llamadas entrantes"</string>
<string name="ClirMmi" msgid="7784673673446833091">"Identificador de llamadas salientes"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"ID de línea conectada"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Restricción de ID de línea conectada"</string>
<string name="CfMmi" msgid="5123218989141573515">"Desvío de llamadas"</string>
<string name="CwMmi" msgid="9129678056795016867">"Llamada en espera"</string>
<string name="BaMmi" msgid="455193067926770581">"Restricción de llamadas"</string>
@@ -666,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"permitir que la aplicación realice la sincronización por Bluetooth"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Permite que la aplicación se sincronice con dispositivos remotos sin la interacción del usuario."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Permite que la aplicación se sincronice con dispositivos remotos sin la interacción del usuario."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"acceder a datos de Bluetooth MAP"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Permite que la aplicación acceda a los datos de Bluetooth MAP."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Permite que la aplicación acceda a los datos de Bluetooth MAP."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"conectarse y desconectarse de WiMAX"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite que la aplicación determine si está activada la conexión WiMAX y que obtenga información sobre las redes WiMAX que están conectadas."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Cambiar el estado de WiMAX"</string>
@@ -717,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite que la aplicación acceda al almacenamiento externo de todos los usuarios."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"Acceder al sistema de archivos caché"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite que la aplicación lea y escriba el sistema de archivos almacenado en caché."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"realizar/recibir llamadas SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite que la aplicación realice y reciba llamadas SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interactuar con la pantalla de llamada"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite que la aplicación controle cuándo y cómo el usuario ve la pantalla de llamada."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"leer uso histórico de la red"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite que la aplicación lea el uso histórico de la red en redes y aplicaciones específicas."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gestionar la política de la red"</string>
@@ -919,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"Falta la tarjeta SIM o no se puede leer. Introduce una tarjeta SIM."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Tarjeta SIM inutilizable"</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Tu tarjeta SIM se ha inhabilitado de forma permanente.\n Ponte en contacto con tu proveedor de servicios inalámbricos para obtener otra tarjeta SIM."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Pista anterior"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Siguiente pista"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Pausar"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Reproducir"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Detener"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Retroceder"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Avanzar"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Solo llamadas de emergencia"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Red bloqueada"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La tarjeta SIM está bloqueada con PUK."</string>
@@ -1511,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Reducir hora"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Establecer p.m."</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Establecer a.m."</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"p. m."</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"a. m."</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"Aumentar mes"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Reducir mes"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"Aumentar día"</string>
@@ -1776,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> seleccionado"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> borrado"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabajo"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Estás en el modo de fijar aplicación. Para salir, mantén presionado el botón de aplicaciones recientes."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Estás en el modo de bloqueo de aplicación."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"¿Usar bloqueo de aplicación?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"La función para fijar una aplicación bloquea la pantalla en una sola aplicación.\n\nPara salir, mantén presionado el botón de aplicaciones recientes."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, GRACIAS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INICIAR"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Fijar aplicación"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ya no estás en el modo de fijar aplicación."</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Solicitar %1$s antes de salir"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"patrón de desbloqueo"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"contraseña"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Las pautas de televisión para los padres"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diálogo sugestivo (normalmente sobre sexo)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Lenguaje vulgar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contenido sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violencia"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasía violenta (solo programación infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index eefd164..ccbb8d3 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite que la aplicación acceda al almacenamiento externo de todos los usuarios."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"acceder al sistema de archivos almacenado en caché"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite que la aplicación lea y escriba el sistema de archivos almacenado en caché."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"hacer/recibir llamadas SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite que la aplicación haga y reciba llamadas SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interactuar con la pantalla de llamada"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite que la aplicación controle cómo y cuándo aparece la pantalla de llamada."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"leer uso de red histórico"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite que la aplicación consulte el uso de red histórico de redes y de aplicaciones específicas."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"administrar política de red"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> seleccionado"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabajo"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Estás en el modo de bloqueo de aplicación. Para salir, mantén pulsado el botón de aplicaciones recientes"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Estás en el modo Bloqueo de aplicación."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"¿Usar Bloqueo de aplicación?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"El bloqueo de aplicación bloquea la pantalla en una sola aplicación.\n\nPara salir, mantén pulsado el botón de aplicaciones recientes."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, GRACIAS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INICIAR"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Bloqueado en la aplicación"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ya no utilizas el bloqueo de aplicación"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Solicitar %1$s antes de salir"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"patrón de desbloqueo"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"contraseña"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Sistema de clasificación por edades para televisión"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diálogo sugerente (normalmente sobre sexo)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Lenguaje grosero"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contenido sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violencia"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasía violenta (solo programación infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml
index faad307..a3820ee 100644
--- a/core/res/res/values-et-rEE/strings.xml
+++ b/core/res/res/values-et-rEE/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Võimaldab rakenduse kõikidel kasutajatel pöörduda välismäluseadme poole."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"juurdepääs vahemälu failisüsteemile"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Võimaldab rakendusel vahemälu failisüsteemi lugeda ja kirjutada."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP-kõnede tegemine/vastuvõtmine"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Lubab rakendusel teha ja vastu võtta SIP-kõnesid."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ekraani Kõne pooleli kasutamine"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Lubab rakendusel juhtida, millal ja kuidas kasutajale kuvatakse ekraan Kõne pooleli."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"võrgukasutuse ajaloo lugemine"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Võimaldab rakendusel lugeda võrgukasutuse ajalugu teatud võrkude ja rakenduste puhul."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"võrgueeskirjade haldamine"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> on valitud"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> on kustutatud"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Töö <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Seade on režiimis Rakendusele lukustamine. Väljumiseks vajutage pikalt nuppu Hiljutised."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Seade on režiimis Rakendusele lukustamine."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Kas soovite kasutada Rakendusele lukustamist?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Rakendusele lukustamise funktsioon lukustab kuva ühele rakendusele.\n\nVäljumiseks vajutage pikalt nuppu Hiljutised."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"TÄNAN, EI"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"KÄIVITA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Rakendusele lukustamine"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Pole enam režiimis Rakendusele lukustamine"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Küsi %1$s enne väljumist"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-koodi"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"avamismustrit"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"parooli"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV-juhised vanematele"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Kahemõtteline dialoog (tavaliselt tähendab, et räägitakse seksist)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Vulgaarne tekst"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuaalne sisu"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Vägivald"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Animeeritud vägivald (ainult lastesaated)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml
index d8e126d..a82f4a3 100644
--- a/core/res/res/values-eu-rES/strings.xml
+++ b/core/res/res/values-eu-rES/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"Baimendu Bluetooth bidez bikotetzea aplikazioen arabera"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Erabiltzailearen interakziorik gabe urruneko gailuekin parekatzeko aukera ematen die aplikazioei."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Erabiltzailearen interakziorik gabe urruneko gailuekin parekatzeko aukera ematen die aplikazioei."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"atzitu Bluetooth MAP datuak"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Bluetooth MAP datuak atzitzea baimentzen die aplikazioei."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Bluetooth MAP datuak atzitzea baimentzen die aplikazioei."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX sarera konektatzea eta deskonektatzea"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"WiMAX gaituta dagoen zehazteko eta konektatutako WiMAX sareei buruzko informazioa ikusteko baimena ematen die aplikazioei."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"WiMAX egoera aldatzea"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Erabiltzaile guztiei kanpoko memoriarako sarbidea emateko baimena ematen die aplikazioei."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"atzitu cachearen fitxategi-sistema"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Cachearen fitxategi-sistema irakurtzea eta bertan idaztea baimentzen die aplikazioei."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"Egin/Jaso SIP deiak"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP deiak egitea eta jasotzea baimentzen die aplikazioei."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"Interaktuatu deiaren pantailarekin"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Erabiltzaileak deiaren pantaila noiz eta nola ikusten duen kontrolatzeko aukera ematen die aplikazioei."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"irakurri sare-erabileraren historia"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Sare eta aplikazio jakin batzuen sare-erabileraren historia irakurtzea baimentzen die aplikazioei."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"kudeatu sare-gidalerroak"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> hautatu da"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ezabatu da"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Laneko <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Aplikazio bakarreko moduan zaude. Irteteko, eduki sakatuta Azkenak botoia"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Aplikazio bakarreko moduan zaude."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Aplikazio bakarreko modua erabili nahi duzu?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Aplikazio bakarreko moduak aplikazio bakarrean blokeatzen du pantaila.\n\nIrteteko, eduki sakatuta Azkenak botoia."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"EZ, ESKERRIK ASKO"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"HASI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Aplikazio batean blokeatuta"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Aplikazio bakarreko modutik irten egin da"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Irten aurretik, eskatu %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN kodea"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"desblokeatzeko eredua"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"pasahitza"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Adinaren araberako sailkapena"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Elkarrizketa lizunak (sarritan sexuari buruz)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Hizkera zakarra"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Eduki sexuala"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Indarkeria"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Indarkeria marrazki bizidunetan (haurrentzako saioak bakarrik)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 0143c8c..bd725ae 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"به برنامه اجازه میدهد به دستگاه ذخیره خارجی برای همه کاربران دسترسی داشته باشد."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"دسترسی به سیستم فایل حافظهٔ پنهان"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"به برنامه اجازه میدهد تا سیستم فایل حافظهٔ پنهان را بخواند و بنویسد."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"تماس گرفتن/دریافت تماس از طریق SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"به برنامه اجازه میدهد تماسهای SIP بگیرد یا دریافت کند."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"تعامل با صفحهنمایش هنگام تماس"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"به برنامه امکان میدهد کنترل کند که کاربر چه زمانی و چگونه صفحهنمایش هنگام تماس را مشاهده کند."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"خواندن سابقه استفاده از شبکه"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"به برنامه اجازه میدهد تا کاربرد شبکه را در طول زمان برای برنامهها و شبکههای خاص بخواند."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"مدیریت خط مشی شبکه"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> انتخاب شد"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> حذف شد"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> محل کار"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"در حالت قفل به برنامه هستید. برای خروج، دکمه موارد اخیر را لمس کرده و نگهدارید"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"در حالت «قفل به برنامه» هستید."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"از «قفل به برنامه» استفاده شود؟"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"قفل به برنامه صفحه را در یک برنامه قفل میکند.\n\nبرای خروج، دکمه موارد اخیر را لمس کرده و نگهدارید."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"نه، سپاسگزارم"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"شروع"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"در حالت قفل به برنامه است"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"دیگر در حالت قفل به برنامه نیست"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"قبل از خروج، %1$s درخواست شود"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"پین"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"الگوی بازگشایی"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"گذرواژه"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"دستورالعملهای مخصوص کنترل تلویزیون برای والدین"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"گفتگوی وسوسهانگیز (معمولاً یعنی گفتگو درباره مسائل جنسی)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"کلام نامناسب"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"محتوای جنسی"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"خشونت"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"خشونت غیرواقعی (فقط برنامهنویسی بچهها)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index 0975d07..71e33e9 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"anna sovelluksen muodostaa Bluetooth-laitepari"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Antaa sovelluksen muodostaa laiteparin etälaitteiden kanssa ilman käyttäjän toimia."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Antaa sovelluksen muodostaa laiteparin etälaitteiden kanssa ilman käyttäjän toimia."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"käytä Bluetooth MAP -tietoja"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Antaa sovelluksen käyttää Bluetooth MAP -tietoja."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Antaa sovelluksen käyttää Bluetooth MAP -tietoja."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"muodosta yhteys WiMAXiin ja katkaise yhteys"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Antaa sovelluksen määrittää, onko WiMAX käytössä, sekä saada selville tietoja WiMAX-verkoista, joihin on muodostettu yhteys."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Vaihda WiMAX-verkon tilaa"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Sallii sovelluksen käyttää ulkoista tallennustilaa kaikille käyttäjille."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"käytä välimuistin tiedostojärjestelmää"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Antaa sovelluksen lukea välimuistin tiedostojärjestelmää ja kirjoittaa siihen."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"soita/vastaanota SIP-puheluja"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Sallii sovelluksen soittaa ja vastaanottaa SIP-puheluja."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interaktiivinen puhelunäyttö"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Sallii sovelluksen hallita, milloin ja miten käyttäjä näkee puhelunäytön."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"verkonkäyttöhistorian lukeminen"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Sallii sovelluksen lukea tiettyjen verkkojen ja sovellusten verkonkäyttöhistoriaa."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"verkkokäytännön hallinnointi"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> on valittu"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> poistettiin"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (työ)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Olet Lukitse sovellukseen -tilassa, poistu painamalla pitkään Viimeaikaiset-painiketta"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Olet Sovellukseen lukitus -tilassa."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Käytetäänkö sovellukseen lukitusta?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Sovellukseen lukitus lukitsee näytön yhteen sovellukseen.\n\nPoistu pitämällä Viimeaikaiset-painiketta painettuna."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"EI KIITOS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ALOITA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Lukittu sovellukseen"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ei enää lukittu sovellukseen"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Kysy %1$s ennen lopettamista"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-koodi"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"lukituksenpoistokuvio"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"salasana"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV Parental Guidelines -ikärajat"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Seksiin viittaava (tarkoittaa yleensä seksistä puhumista)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Karkea kielenkäyttö"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuaalinen sisältö"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Väkivalta"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasian omaista väkivaltaa (vain lastenohjelmat)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index b8420b3..4a63f0e 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -71,7 +71,7 @@
<string name="ClipMmi" msgid="6952821216480289285">"Numéro de l\'appelant (entrant)"</string>
<string name="ClirMmi" msgid="7784673673446833091">"Numéro de l\'appelant (sortant)"</string>
<string name="ColpMmi" msgid="3065121483740183974">"Identifiant de la ligne connectée"</string>
- <string name="ColrMmi" msgid="4996540314421889589">"Restriction d\'dentifiant de la ligne connectée"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Restriction d\'identifiant de la ligne connectée"</string>
<string name="CfMmi" msgid="5123218989141573515">"Transfert d\'appel"</string>
<string name="CwMmi" msgid="9129678056795016867">"Appel en attente"</string>
<string name="BaMmi" msgid="455193067926770581">"Interdiction d\'appel"</string>
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"autoriser l\'application à s\'associer par Bluetooth"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Permet à l\'application de s\'associer aux appareils à distance sans interaction avec l\'utilisateur."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Permet à l\'application de s\'associer aux appareils à distance sans interaction avec l\'utilisateur."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"accéder aux données du profil MAP Bluetooth"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Permet à l\'application d\'accéder aux données du profil MAP (Message Access Profile) Bluetooth."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Permet à l\'application d\'accéder aux données du profil MAP (Message Access Profile) Bluetooth."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"se connecter au réseau WiMAX et s\'en déconnecter"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permet à l\'application de déterminer si le WiMAX est activé et d\'obtenir des détails sur tous les réseaux WiMAX connectés."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Modifier l\'état du WiMAX"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permet à l\'application d\'accéder à la mémoire de stockage externe pour tous les utilisateurs."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"accéder au système de fichiers en cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permet à l\'application d\'obtenir des droits en lecture et en écriture pour le système de fichiers du cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"faire et recevoir des appels SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Autorise l\'application à effectuer et à recevoir des appels SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interagir avec l\'écran d\'appel"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permet à l\'application de contrôler quand et comment l\'écran d\'appel s\'affiche."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lire l\'historique d\'utilisation de réseaux"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permet à l\'application de lire l\'historique d\'utilisation de réseaux et d\'applications particuliers."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gérer les politiques du réseau"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"« <xliff:g id="ITEM">%1$s</xliff:g> » a été sélectionné"</string>
<string name="deleted_key" msgid="7659477886625566590">"« <xliff:g id="KEY">%1$s</xliff:g> » a été supprimé"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (travail)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Vous utilisez la fonctionnalité Verrouiller sur l\'application. Pour quitter ce mode, maintenez le doigt sur le bouton « Récents »."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Vous êtes en mode « Verrouiller sur l\'application »."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Utiliser la fonctionnalité « Verrouiller sur l\'application »?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"La fonctionnalité Verrouiller sur l\'application verrouille l\'écran sur une seule application.\n\nPour quitter ce mode, maintenez le doigt sur le bouton « Récents »."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NON, MERCI"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"COMMENCER"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Verrouillage sur l\'application activé"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Verrouillage sur l\'application désactivé"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Demander le %1$s avant de quitter"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"NIP"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"schéma de déverrouillage"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"mot de passe"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Accord parental pour la télévision"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialogues suggestifs (langage à caractère sexuel)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Langage grossier"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contenu à caractère sexuel"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violence"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violence imaginaire (programmation pour enfants uniquement)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 2bb1c3d..d300946 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permet à l\'application d\'accéder à la mémoire de stockage externe pour tous les utilisateurs."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"accéder au système de fichiers en cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permet à l\'application d\'obtenir des droits en lecture/écriture concernant le système de fichiers du cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"effectuer/recevoir des appels SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Autorise l\'application à effectuer et à recevoir des appels SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"contrôler l\'écran d\'appel"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permet à l\'application de contrôler quand et comment l\'écran d\'appel s\'affiche."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lire l\'historique d\'utilisation du réseau"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permet à l\'application de lire l\'historique d\'utilisation de réseaux et d\'applications spécifiques."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gérer les règles du réseau"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"\"<xliff:g id="ITEM">%1$s</xliff:g>\" sélectionné"</string>
<string name="deleted_key" msgid="7659477886625566590">"\"<xliff:g id="KEY">%1$s</xliff:g>\" supprimé"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (travail)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Vous utilisez la fonctionnalité Verrouiller sur l\'application. Pour quitter ce mode, appuyez de manière prolongée sur le bouton \"Récents\"."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Vous êtes en mode \"Verrouiller sur l\'application\"."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Utiliser la fonctionnalité Verrouiller sur l\'application ?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"La fonctionnalité Verrouiller sur l\'application verrouille l\'écran sur une seule application.\n\nPour quitter ce mode, appuyez de manière prolongée sur le bouton \"Récents\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NON, MERCI"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ACTIVER"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Verrouillage sur l\'application activé"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Verrouillage sur l\'application désactivé"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Demander le %1$s avant de quitter"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"code PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"schéma de déverrouillage"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"mot de passe"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Accord parental pour la télévision"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialogues suggestifs (langage à caractère sexuel)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Langage grossier"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contenu à caractère sexuel"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violence"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violence imaginaire (programmation pour enfants uniquement)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml
index 569f503..622d3d0 100644
--- a/core/res/res/values-gl-rES/strings.xml
+++ b/core/res/res/values-gl-rES/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"permitir sincronización Bluetooth por parte da aplicación"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Permite á aplicación sincronizarse con dispositivos remotos sen interacción do usuario."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Permite á aplicación sincronizarse con dispositivos remotos sen interacción do usuario."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"acceso aos datos de Bluetooth MAP"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Permite que a aplicación acceda aos datos de Bluetooth MAP."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Permite que a aplicación acceda aos datos de Bluetooth MAP."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"conectar e desconectar de WiMAX"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite á aplicación determinar se WiMAX está activado e obter información acerca das redes WiMAX que están conectadas."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Cambiar estado de WiMAX"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite á aplicación acceder ao almacenamento externo de todos os usuarios."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"acceder ao sistema de ficheiros da caché"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite á aplicación ler e escribir no sistema de ficheiros da caché."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"facer/recibir chamadas SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite que a aplicación faga e reciba chamadas SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interactuar cunha pantalla de chamada"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite á aplicación controlar cando e como ve o usuario a pantalla de chamada."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ler o historial de uso da rede"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite á aplicación ler o uso da rede histórico de redes e aplicacións específicas."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"xestionar a política de rede"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> seleccionado"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> do traballo"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Estás no modo de bloqueo de aplicación. Para saír, mantén premido o botón Recentes"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Estás no modo Bloqueo de aplicación."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Queres utilizar a función Bloqueo de aplicación?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"O bloqueo de aplicación bloquea a pantalla nunha soa aplicación.\n\nPara saír, mantén premido o botón Recentes."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NON, GRAZAS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"SI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Bloqueo de aplicación"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Xa non estás no modo bloqueo de aplicación"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Solicitar %1$s antes de saír"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"deseño de desbloqueo"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"contrasinal"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"As TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diálogo insinuante (normalmente con temática sexual)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Linguaxe vulgar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contido sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violencia"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasía violenta (só programación infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index bdd18de..9662dda 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -419,7 +419,7 @@
<string name="permdesc_bindDeviceAdmin" msgid="569715419543907930">"धारक को किसी उपकरण व्यवस्थापक को उद्देश्य भेजने देता है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होना चाहिए."</string>
<string name="permlab_bindTvInput" msgid="5601264742478168987">"टीवी इनपुट से आबद्ध करें"</string>
<string name="permdesc_bindTvInput" msgid="2371008331852001924">"धारक को किसी टीवी इनपुट के शीर्ष-स्तर इंटरफ़ेस से आबद्ध होने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होना चाहिए."</string>
- <string name="permlab_modifyParentalControls" msgid="4611318225997592242">"अभिभावकीय नियंत्रणों को बदलें"</string>
+ <string name="permlab_modifyParentalControls" msgid="4611318225997592242">"अभिभावकीय नियंत्रणों को बदल सकता है"</string>
<string name="permdesc_modifyParentalControls" msgid="7438482894162282039">"धारक को सिस्टम का अभिभावकीय नियंत्रणों वाला डेटा बदलने देता है. सामान्य ऐप्स के लिए कभी भी आवश्यकता नहीं होनी चाहिए."</string>
<string name="permlab_manageDeviceAdmins" msgid="4248828900045808722">"उपकरण उपकरण सुचारू ढ़ंग से चलाने वाले को जोड़ें या निकालें"</string>
<string name="permdesc_manageDeviceAdmins" msgid="5025608167709942485">"धारक को सक्रिय डिवाइस व्यवस्थापकों को जोड़ने या निकालने देता है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होना चाहिए."</string>
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"ऐप्स को सभी उपयोगकर्ताओं के बाहरी संग्रहण तक पहुंचने दें."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"कैश फ़ाइल सिस्टम में पहंचे"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ऐप्स को संचय फ़ाइल सिस्टम पढ़ने और लिखने देता है."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP कॉल करें/प्राप्त करें"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"ऐप्स को SIP कॉल करने और प्राप्त करने देती है."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"इन-कॉल स्क्रीन से सहभागिता करें"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ऐप्लिकेशन को यह नियंत्रित करने देती है कि उपयोगकर्ता को इन-कॉल स्क्रीन कब और कैसी दिखाई देती है."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ऐतिहासिक नेटवर्क उपयोग पढें"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"किसी ऐप्स को विशिष्ट नेटवर्क और ऐप्स के लिए ऐतिहासिक नेटवर्क उपयोग को पढ़ने देता है."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"नेटवर्क नीति प्रबंधित करें"</string>
@@ -744,7 +746,7 @@
<string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"ऐप्लिकेशन को DRM प्रमाणपत्रों का प्रावधान और उपयोग करने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यकता नहीं होना चाहिए."</string>
<string name="permlab_handoverStatus" msgid="1159132046126626731">"Android Beam स्थानान्तरण स्थिति प्राप्त करें"</string>
<string name="permdesc_handoverStatus" msgid="4788144087245714948">"इस ऐप्लिकेशन को वर्तमान Android Beam स्थानान्तरणों के बारे में जानकारी प्राप्त करने देती है."</string>
- <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM प्रमाणपत्रों को निकालें"</string>
+ <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM प्रमाणपत्रों को निकाल सकता है"</string>
<string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"एप्लिकेशन को DRM प्रमाणपत्रों को निकालने देता है. सामान्य ऐप्स के लिए कभी भी आवश्यकता नहीं होनी चाहिए."</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"पासवर्ड नियम सेट करें"</string>
<string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रीन-अनलॉक पासवर्ड में अनुमति प्राप्त लंबाई और वर्णों को नियंत्रित करें."</string>
@@ -1348,7 +1350,7 @@
<string name="extmedia_format_button_format" msgid="4131064560127478695">"प्रारूपित करें"</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB डीबग करना कनेक्ट किया गया"</string>
<string name="adb_active_notification_message" msgid="1016654627626476142">"USB डीबग करना अक्षम करने के लिए स्पर्श करें."</string>
- <string name="select_input_method" msgid="8547250819326693584">"कीबोर्ड बदलें"</string>
+ <string name="select_input_method" msgid="8547250819326693584">"कीबोर्ड बदल सकता है"</string>
<string name="configure_input_methods" msgid="4769971288371946846">"कीबोर्ड चुनें"</string>
<string name="use_physical_keyboard" msgid="6203112478095117625">"भौतिक कीबोर्ड"</string>
<string name="hardware" msgid="7517821086888990278">"हार्डवेयर"</string>
@@ -1499,8 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"घंटे कम करें"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"सायं सेट करें"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"प्रात: सेट करें"</string>
- <string name="time_picker_pm_label" msgid="9075415075642718536">"PM"</string>
- <string name="time_picker_am_label" msgid="7367798547923815593">"AM"</string>
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"अप"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"पू"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"माह बढ़ाएं"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"माह कम करें"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"दिन बढ़ाएं"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> चयनित"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> को हटा दिया गया"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्यस्थल का <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"आप ऐप्स-पर-लॉक मोड में हैं. बाहर निकलने के लिए, हाल ही के बटन को स्पर्श करके रखें"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"आप ऐप्स-पर-लॉक करें मोड में हैं."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ऐप्स-पर-लॉक करें का उपयोग करें?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"ऐप्स-पर-लॉक करेंं प्रदर्शन को एकल ऐप्स में लॉक कर देता है.\n\nबाहर निकलने के लिए, हाल ही के बटन को स्पर्श करके रखें."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"नहीं, धन्यवाद"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"प्रारंभ करें"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"ऐप्स-पर-लॉक किया गया"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"अब ऐप्स-पर-लॉक नहीं है"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"बाहर निकलने से पहले %1$s के लिए पूछें"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"पिन"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"पैटर्न अनलॉक करें"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"पासवर्ड"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"टीवी अभिभावकीय दिशानिर्देश"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"अश्लील संवाद (आमतौर पर यौन संबंधी बातचीत)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"अश्लील भाषा"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"यौन सामग्री"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"हिंसा"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"काल्पनिक हिंसा (केवल बच्चों के कार्यक्रम के लिए)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index effbb26..4e434f4 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Omogućuje aplikaciji pristup vanjskoj pohrani za sve korisnike."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"pristup sustavu datoteka predmemorije"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Aplikaciji omogućuje čitanje i pisanje u datotečnom sustavu privremene memorije."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"upućivanje/primanje SIP poziva"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Aplikacija može upućivati i primati SIP pozive."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakcija sa zaslonom tijekom poziva"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Omogućuje aplikaciji upravljanje time kada će i kako korisnik vidjeti zaslon tijekom poziva."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"čitanje povijesti upotrebe mreže"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Aplikaciji omogućuje čitanje povijesti upotrebe mreže za određene mreže i aplikacije."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"Upravljanje mrežnim pravilima"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Odabrana je stavka <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Izbrisan je broj <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> za posao"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"U načinu ste zaključavanja na aplikaciju. Da biste ga zatvorili, dodirnite i zadržite gumb Najnoviji"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"U načinu ste zaključavanja na aplikaciju."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Želite li upotrijebiti zaključavanje na aplikaciju?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Značajkom zaključavanja na aplikaciju zaključava se prikaz na pojedinačnu aplikaciju.\n\nDa biste je zatvorili, dodirnite i zadržite gumb Najnoviji."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NE, HVALA"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"POKRENI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Zaključano na aplikaciju"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Više nije zaključano na aplikaciju"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Traži %1$s prije zatvaranja"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"uzorak za otključavanje"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"zaporka"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Roditeljske smjernice za TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Sugestivan dijalog (obično se odnosi na razgovor o seksu)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Vulgarni izrazi"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksualni sadržaj"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Nasilje"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantastično nasilje (samo za dječje programe)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index d1fbe2a..d38e841 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Minden felhasználó számára lehetővé teszi, hogy az alkalmazás hozzáférjen külső tárolókhoz."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"hozzáférés a gyorsítótár fájlrendszeréhez"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Lehetővé teszi az alkalmazás számára a gyorsítótár-fájlrendszer olvasását és írását."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP-hívások indítása/fogadása"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP-hívások indításának és fogadásának engedélyezése az alkalmazás számára."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakció a hívás közbeni képernyővel"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Lehetővé teszi, hogy az alkalmazás felügyelje, a felhasználók mikor és hogyan láthatják a hívás közbeni képernyőt."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"hálózathasználati előzmények beolvasása"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Lehetővé teszi az alkalmazás számára a hálózathasználati előzmények beolvasását adott hálózatok és alkalmazások esetében."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"hálózati házirend kezelése"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> kiválasztva"</string>
<string name="deleted_key" msgid="7659477886625566590">"A(z) <xliff:g id="KEY">%1$s</xliff:g> érték törölve"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Munkahelyi <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Alkalmazászárolás módban van. A kilépéshez tartsa lenyomva a Legutóbbiak gombot."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Ön alkalmazászárolási módban van."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Használni szeretné az alkalmazászárolást?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Az alkalmazászárolás lezárja a kijelzőt az adott alkalmazásban.\n\nA kilépéshez tartsa lenyomva a Legutóbbiak gombot."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"KÖSZÖNÖM, NEM"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INDÍT"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Alkalmazászárolás aktiválva"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Az alkalmazászárolás megszűnt"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"%1$s kérése kilépés előtt"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN kód"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"feloldási minta"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"jelszó"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"„TV Parental Guidelines” értékelési rendszer"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Kétértelmű párbeszéd (ez általában a szexről való beszélgetést jelent)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Durva nyelvezet"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Szexuális tartalom"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Erőszak"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Erőszak megjelenítése rajzfilmekben (csak gyerekműsorok esetén)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml
index 8b4567c..69c0c60 100644
--- a/core/res/res/values-hy-rAM/strings.xml
+++ b/core/res/res/values-hy-rAM/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"Մուտքային զանգողի ID"</string>
<string name="ClirMmi" msgid="7784673673446833091">"Ելքային զանգողի ID"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"Կապված տողի ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Կապված տողի ID-ի սահմանափակում"</string>
<string name="CfMmi" msgid="5123218989141573515">"Զանգի վերահասցեավորում"</string>
<string name="CwMmi" msgid="9129678056795016867">"Զանգի սպասում"</string>
<string name="BaMmi" msgid="455193067926770581">"Զանգի արգելափակում"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Թույլ է տալիս հավելվածին մուտք գործել արտաքին պահոց բոլոր օգտվողների համար:"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"մուտք քեշի ֆայլերի համակարգ"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Թույլ է տալիս հավելվածին գրել և կարդալ քեշ ֆայլային համակարգը:"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"կատարել կամ ստանալ SIP զանգեր"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ծրագրին թույլ է տալիս կատարել և ստանալ SIP զանգեր:"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"փոխազդել մուտքային զանգի էկրանի հետ"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Թույլ է տալիս ծրագրին վերահսկել՝ երբ և ինչպես է օգտվողը տեսնում մուտքային զանգը էկրանին:"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"կարդալ պատմական ցանցի օգտագործումը"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Թույլ է տալիս հավելվածին կարդալ հատուկ ցանցերի և հավելվածների համար ցանցի օգտագործման պատմությունը:"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"կառավարել ցանցի քաղաքականությունը"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM քարտը բացակայում է կամ չի կարող կարդացվել: Մտցրեք SIM քարտ:"</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Անպիտան SIM քարտ:"</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Ձեր SIM քարտը ընդմիշտ կասեցված է:\n Կապվեք ձեր անլար ծառայությունների մատակարարի հետ մեկ այլ SIM քարտի համար:"</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Նախորդը"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Հաջորդը"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Դադարեցնել"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Նվագարկել"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Դադարեցնել"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Հետ փաթաթել"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Արագ առաջ անցնել"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Միայն արտակարգ իրավիճակների զանգեր"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Ցանցը կողպված է"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM քարտը PUK-ով կողպված է:"</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Նվազեցնել ժամը"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Դնել PM"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Դնել AM"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"ԿՀ"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"ԿԱ"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"Աճեցնել ամիսը"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Նվազեցնել ամիսը"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"Աճեցնել օրը"</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Ընտրված է <xliff:g id="ITEM">%1$s</xliff:g> տարրը"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> թիվը ջնջված է"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Աշխատանքային <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Դուք գտնվում եք Lock-to-app ռեժիմում: Սեղմեք և պահեք վերջին ծրագրերի կոճակը՝ դուրս գալու համար"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Դուք գտնվում եք Lock-to-app ռեժիմում:"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Օգտագործե՞լ lock-to-app գործառույթը:"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Lock-to-app գործառույթը արգելափակում է ցուցադրումը առանձին ծրագրերում:\n\nԳործառույթն անջատելու համար սեղմեք և պահեք վերջին ծրագրերի կոճակը:"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ՈՉ, ՇՆՈՐՀԱԿԱԼՈՒԹՅՈՒՆ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"Այո"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Ծրագրի մուտքը կողպված է"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ծրագրի մուտքն այլևս կողպված չէ"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Հայցել %1$s` փակելուց առաջ"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ապակողպող նախշ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"գաղտնաբառ"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Հեռուստացույցի Ծնողական ուղեցույց"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Անպարկեշտ երկխոսություն (սովորաբար նշանակում է խոսել սեքսից)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Կոպիտ խոսք"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Սեռական բնույթի բովանդակություն"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Բռնություն"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Ֆանտաստիկ բռնություն (միայն մանկական ծրագրում)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 0294027..465f9d4 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Izinkan aplikasi mengakses penyimpanan eksternal untuk semua pengguna."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"akses sistem file cache."</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Mengizinkan apl membaca dan menulis pada sistem file cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"lakukan/terima panggilan SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Izinkan aplikasi melakukan dan menerima panggilan SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"berinteraksi dengan layar dalam panggilan"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Memungkinkan aplikasi mengontrol kapan dan bagaimana pengguna melihat layar dalam panggilan."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"baca riwayat penggunaan jaringan"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Mengizinkan apl membaca penggunaan jaringan historis untuk apl dan jaringan tertentu."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"kelola kebijakan jaringan"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> dipilih"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> dihapus"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Kantor <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Anda dalam mode kunci ke aplikasi. Untuk keluar, sentuh dan tahan tombol Terkini"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Anda dalam mode Kunci ke Aplikasi."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Gunakan kunci ke aplikasi?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Kunci ke aplikasi mengunci tampilan ke satu aplikasi tunggal.\n\nUntuk keluar, sentuh dan tahan tombol Terkini."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"TIDAK, TERIMA KASIH"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"MULAI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Terkunci ke aplikasi"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Tidak lagi terkunci ke aplikasi"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Minta %1$s sebelum keluar"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"pola pembuka kunci"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"sandi"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Panduan TV untuk Orang Tua"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialog yang menjurus (Biasanya pembicaraan tentang seks)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Bahasa yang vulgar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Konten seksual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Kekerasan"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Kekerasan dalam dunia khayalan (Khusus program anak)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml
index 92b1ee3..716c789 100644
--- a/core/res/res/values-is-rIS/strings.xml
+++ b/core/res/res/values-is-rIS/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Leyfir forriti að fá aðgang að ytri geymslu allra notenda."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"aðgangur að skráakerfi skyndiminnis"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Leyfir forriti að lesa og skrifa í skráakerfi skyndiminnis."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"hringja/svara SIP-símtölum"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Leyfir forritinu að hringja og svara SIP-símtölum."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"eiga samskipti við símtalsskjá"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Leyfir forriti að stjórna því hvenær og hvernig notandi sér símtalsskjá."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lesa söguleg gögn um netnotkun"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Leyfir forriti að lesa söguleg gögn um netnotkun fyrir tiltekin net og forrit."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"hafa umsjón með netstefnu"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> valið"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eytt"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> í vinnu"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Forritslæsing er virk. Til aflétta henni heldurðu inni hnappinum fyrir nýlegt."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Forritslæsing er virk."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Nota forritslæsingu?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Forritslæsing læsir skjánum þannig að hann birti aðeins eitt forrit.\n\nTil aflétta henni heldurðu inni hnappinum fyrir nýlegt."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEI, TAKK"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"RÆSA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Læst í forriti"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ekki lengur læst í forriti"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Biðja um %1$s áður en lokað er"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-númer"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"opnunarmynstur"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"aðgangsorð"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Leiðbeinandi aldurstakmarkanir sjónvarpsefnis fyrir foreldra"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Tvírætt tal (þýðir yfirleitt samræður um kynlíf)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Gróft tungumál"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Kynferðislegt efni"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Ofbeldi"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Ævintýraofbeldi (aðeins barnaefni)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index ccd3a0d..13374b7 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Consente all\'applicazione di accedere alla memoria esterna di tutti gli utenti."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"accesso al filesystem nella cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Consente all\'applicazione di leggere e scrivere il filesystem nella cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"fare/ricevere chiamate SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Consente all\'app di effettuare e ricevere chiamate SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interazione con lo schermo durante una chiamata"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Consente all\'app di stabilire quando e come l\'utente vede lo schermo durante una chiamata."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lettura dati storici di utilizzo della rete"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Consente all\'applicazione di leggere dati storici di utilizzo della rete per reti e applicazioni specifiche."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gestione norme rete"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Elemento selezionato: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminato"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> lavoro"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Sei in modalità Blocca su app. Per uscire, tocca e tieni premuto il pulsante Recenti."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Sei in modalità Blocca su app."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Utilizzare Blocca su app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"La funzione Blocca su app consente di bloccare la visualizzazione in un\'unica app.\n\nPer uscire, tocca e tieni premuto il pulsante Recenti."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NO, GRAZIE"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"AVVIA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Avvia Blocca su app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Esci da Blocca su app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Chiedi %1$s prima di uscire"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"sequenza di sblocco"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"password"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"The TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialogo allusivo (in genere significa che il tema è il sesso)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Linguaggio scurrile"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Contenuti di natura sessuale"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violenza"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violenza simulata (solo programmazione per bambini)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 7c1a941..01444be 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"מאפשר לאפליקציה לגשת לאחסון חיצוני עבור כל המשתמשים."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"גישה למערכת הקבצים בקובץ השמור"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"מאפשר לאפליקציה לקרוא ולכתוב במערכת הקבצים של הקבצים השמורים."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"ביצוע/קבלה של שיחות SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"אפשר לאפליקציה לבצע ולקבל שיחות SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"צור אינטראקציה עם מסך שיחה נכנסת"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"מאפשר לאפליקציה לקבוע מתי ואיך המשתמש יראה שיחה נכנסת על המסך."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"קריאת נתוני שימוש היסטוריים ברשת"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"מאפשר לאפליקציה לקרוא נתוני שימוש היסטוריים ברשת עבור רשתות ואפליקציות ספציפיות."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"נהל מדיניות רשת"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> נבחר"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> נמחק"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"עבודה <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"אתה במצב \'נעילה באפליקציה\'. כדי לצאת, גע נגיעה ממושכת בלחצן \'אחרונים\'"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"אתה במצב \'נעילה באפליקציה\'."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"האם להשתמש ב\'נעילה באפליקציה\'?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"\'נעילה באפליקציה\' נועלת את התצוגה באפליקציה יחידה.\n\nכדי לצאת, גע נגיעה ממושכת בלחצן \'אחרונים\'."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"לא, תודה"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"הפעל"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"נעול באפליקציה"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"הנעילה באפליקציה הסתיימה"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"בקש %1$s לפני יציאה"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"מספר PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"קו ביטול נעילה"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"סיסמה"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"הנחיות להורים לגבי טלוויזיה"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"שיח בעל רמיזות מיניות (שפירושו בדרך כלל עיסוק במין)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"שפה גסה"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"תוכן מיני"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"אלימות"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"אלימות בדיונית (בתכניות לילדים בלבד)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index bc8841d..09d51da 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"着信時の発信者番号"</string>
<string name="ClirMmi" msgid="7784673673446833091">"発信者番号"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"接続回線ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"接続回線IDの制限"</string>
<string name="CfMmi" msgid="5123218989141573515">"着信転送"</string>
<string name="CwMmi" msgid="9129678056795016867">"通話中着信"</string>
<string name="BaMmi" msgid="455193067926770581">"発信制限"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"すべてのユーザーの外部ストレージへのアクセスをアプリに許可します。"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"キャッシュファイルシステムにアクセス"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"キャッシュファイルシステムの読み書きをアプリに許可します。"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP通話の発着信"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP通話の発着信をアプリに許可します。"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"通話画面とのインタラクション"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"通話画面をユーザーに表示するタイミングと方法の制御をアプリに許可します。"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ネットワーク使用履歴の読み取り"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"特定のネットワークやアプリに関するネットワーク使用履歴の読み取りをアプリに許可します。"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ネットワークポリシーの管理"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIMカードが見つからないか読み取れません。SIMカードを挿入してください。"</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"SIMカードは使用できません。"</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"お使いのSIMカードは永久に無効となっています。\nワイヤレスサービスプロバイダに問い合わせて新しいSIMカードを入手してください。"</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"前のトラック"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"次のトラック"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"一時停止"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"再生"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"停止"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"巻き戻し"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"早送り"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"緊急通報のみ"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"ネットワークがロックされました"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIMカードはPUKでロックされています。"</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"1時間戻します"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"午後に設定"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"午前に設定"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"午後"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"午前"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"1か月進めます"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"1か月戻します"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"1日進めます"</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g>を選択しました"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g>を削除しました"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"仕事の<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"アプリロックモードです。終了するには、[最近]ボタンを押し続けます。"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"現在アプリロックモードです。"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"アプリロックの使用"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"アプリロックでは表示を単一のアプリにロックします。\n\n終了するには、[最近]ボタンを押し続けます。"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"いいえ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"開始する"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"アプリにロックされています"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"アプリにロックされていません"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"終了する前に%1$sを求める"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ロック解除パターン"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"パスワード"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"テレビのペアレンタルガイドライン"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"性的なものを暗示する会話（通常、性行為に関する会話を意味します）"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"不適切な言葉"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"性的なコンテンツ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"暴力"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"架空の暴力描写（子ども向け番組のみ）"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml
index f606bb1..9849d9b 100644
--- a/core/res/res/values-ka-rGE/strings.xml
+++ b/core/res/res/values-ka-rGE/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"შემომავალი ზარის აბონენტის ID"</string>
<string name="ClirMmi" msgid="7784673673446833091">"გამავალი მრეკავის ID"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"დაუკავშირდა Line ID-ს"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"დაუკავშირდა Line ID Restriction-ს"</string>
<string name="CfMmi" msgid="5123218989141573515">"ზარის გადამისამართება"</string>
<string name="CwMmi" msgid="9129678056795016867">"ზარის ლოდინი"</string>
<string name="BaMmi" msgid="455193067926770581">"ზარის აკრძალვა"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"აპს შეეძლება ყველა მომხმარებლის გარე მეხსიერებასთან წვდომა."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"ქეშის ფაილურ სისტემაზე წვდომა"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"აპებს აძლევს ქეშირებული სისტემური ფაილების წაკითხვისა და მათში ჩანაწერების გაკეთების საშუალებას."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP ზარების წამოწყება/მიღება"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"ნებას რთავს აპს განახორციელოს და მიიღოს SIP ზარები."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ზარს-შიდა ეკრანთან ინტერაქცია"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"საშუალებას აძლევს აპს აკონტროლოს, თუ როდის და როგორ იხილავს მომხმარებელი ზარს-შიდა ეკრანს."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ქსელის გამოყენების ისტორიის წაკითხვა"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"აპს შეეძლება კონკრეტული ქსელისა და აპების ისტორიული ქსელის გამოყენების წაკითხვას."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ქსელის დებულების მართვა"</string>
@@ -747,7 +747,7 @@
<string name="permlab_handoverStatus" msgid="1159132046126626731">"Android Beam ტრანსფერის სტატუსის მიღება"</string>
<string name="permdesc_handoverStatus" msgid="4788144087245714948">"ნებას რთავს ამ აპლიკაციას, მიიღოს ინფორმაცია მიმდინარე Android Beam-ის ტრანსფერების შესახებ"</string>
<string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM სერტიფიკატების ამოშლა"</string>
- <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"საშუალებას აძლევს აპლიკაციას ამოშალეს DRM სერtიფიკატები. ეს წესით ჩვეულებრივ აპებს არ უნდა დაჭირდეს."</string>
+ <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"საშუალებას აძლევს აპლიკაციას ამოშალოს DRM სერtიფიკატები. ეს წესით ჩვეულებრივ აპებს არ უნდა დაჭირდეს."</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"პაროლის წესების დაყენება"</string>
<string name="policydesc_limitPassword" msgid="3252114203919510394">"გააკონტროლეთ ეკრანის განბლოკვის პაროლში დაშვებული სიმბოლოები და მისი სიგრძე."</string>
<string name="policylab_watchLogin" msgid="914130646942199503">"ეკრანის განბლოკვის მცდელობების გაკონტროლება"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM ბარათი არ არის ან არ იკითხება. ჩადეთ SIM ბარათი."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"არამოხმარებადი SIM ბარათი."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"თქვენი SIM ბარათი გამუდმებით გამორთული იყო.\n დაუკავშირდით თქვენი უკაბელო სერვისის პროვაიდერს სხვა SIM ბარათისთვის."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"წინა ჩანაწერი"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"შემდეგი ჩანაწერი"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"პაუზა"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"დაკვრა"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"შეწყვეტა"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"უკან გადახვევა"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"წინ გადახვევა"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"მხოლოდ გადაუდებელი დახმარების ზარები"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"ქსელი ჩაკეტილია"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM ბარათი არის PUK-ით დაბლოკილი."</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"საათით უკან"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM-ის დაყენება"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM-ის დაყენება"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"PM"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"AM"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"თვის მომატება"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"ერთი თვით უკან"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"დღის მომატება"</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"არჩეულია <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> წაიშალა"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"სამსახური <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"თქვენ იმყოფებით აპზე ფიქსაციის რეჟიმში. გამოსასვლელად, დააჭირეთ და დააყოვნეთ ბოლო აპების ღილაკზე"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"თქვენ იმყოფებით აპზე ფიქსაციის რეჟიმში."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"გსურთ „აპზე ფიქსაციის“ გამოყენება?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"„აპზე ფიქსაცია“ კეტავს ეკრანს ერთ აპში.\n\nგასასვლელად დააჭირეთ და არ აუშვათ ღილაკს „ბოლო აპები“."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"არა, გმადლობთ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"დაწყება"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"აპზე დაფიქსირებული"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"აპზე დაფიქსირებული აღარ არის"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"გასვლამდე %1$s-ის მოთხოვნა"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-კოდი"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"განბლოკვის ნიმუში"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"პაროლი"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"ტელევიზიის მშობელთა სახელმძღვანელო"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"მაცდუნებელი დიალოგი (უმეტეს შემთხვევაში იგულისხმება სექსზე საუბარი)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"უხამსი მეტყველება"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"სექსუალური ხასიათის შინაარსი"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ძალადობა"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ფენტეზი ჟანრის ძალადობა (მხოლოდ საბავშვო პროგრამაბეში)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml
index e468c1d..3c3d15b 100644
--- a/core/res/res/values-kk-rKZ/strings.xml
+++ b/core/res/res/values-kk-rKZ/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Қолданбаға барлық пайдаланушылардың сыртқы жадына кіру мүмкіндігін береді."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"кэш файл жүйесіне кіру"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Қолданбаға кэш файлдық жүйесін оқуға және оған жазуға рұқсат береді."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP қоңырауларын шалу/қабылдау"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Қолданбаға SIP қоңырауларын шалуға және қабылдауға рұқсат етеді."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"қоңырау кезінде экранды қолдану"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Қолданбаға пайдаланушының қоңырау кезінде экранды қашан және қалай көретінін басқару мүмкіндігін береді."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"тарихи желі қолданысын оқу"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Қолданбаға белгілі бір желілер және қолданбалар үшін журналдық желіні пайдалануды оқуға рұқсат береді."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"желі саясатын басқару"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> таңдалды"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> жойылды"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Жұмыс <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Сіз қолданбаға бекіту режиміндесіз. Шығу үшін «Жақындағылар» түймесін түртіп, ұстап тұрыңыз"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Сіз қолданбаға бекіту режиміндесіз."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Қолданбаға бекітуді пайдалану керек пе?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Қолданбаға бекіту дисплейді бір қолданбада бекітеді.\n\nШығу үшін «Жақындағылар» түймесін түртіп, ұстап тұрыңыз."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ЖОҚ, РАҚМЕТ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"БАСТАУ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Қолданбаға бекітілді"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Енді қолданбаға бекітілмеген"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Шығу алдында %1$s сұрау"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"бекітпесін ашу әдісі"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"құпия сөз"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Теледидардың ата-аналарға арналған нұсқаулары"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Ұятсыз нәрселерді тұспалдайтын диалог (әдетте жыныстық қатынас туралы әңгімелерді білдіреді)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Дөрекі сөздер"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Жыныстық қатынасқа қатысты мазмұн"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Қатігездік"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Қиялдағы қатігездік (тек балалардың бағдарламалары)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml
index c579b3e..f2eaf10 100644
--- a/core/res/res/values-km-rKH/strings.xml
+++ b/core/res/res/values-km-rKH/strings.xml
@@ -68,7 +68,7 @@
</plurals>
<string name="imei" msgid="2625429890869005782">"IMEI"</string>
<string name="meid" msgid="4841221237681254195">"MEID"</string>
- <string name="ClipMmi" msgid="6952821216480289285">"លេខសម្គាល់អ្នកហៅចូល"</string>
+ <string name="ClipMmi" msgid="6952821216480289285">"លេខសម្គាល់អ្នកហៅចូល"</string>
<string name="ClirMmi" msgid="7784673673446833091">"លេខសម្គាល់អ្នកហៅចេញ"</string>
<string name="ColpMmi" msgid="3065121483740183974">"បានភ្ជាប់លេខសម្គាល់បន្ទាត់"</string>
<string name="ColrMmi" msgid="4996540314421889589">"បានភ្ជាប់ការដាក់កម្រិតលេខសម្គាល់បន្ទាត់"</string>
@@ -127,7 +127,7 @@
<string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> ៖ មិនបានបញ្ជូនបន្ត"</string>
<string name="fcComplete" msgid="3118848230966886575">"កូដលក្ខណៈពេញលេញ។"</string>
<string name="fcError" msgid="3327560126588500777">"បញ្ហាការតភ្ជាប់ ឬកូដលក្ខណៈមិនត្រឹមត្រូវ។"</string>
- <string name="httpErrorOk" msgid="1191919378083472204">"យល់ព្រម"</string>
+ <string name="httpErrorOk" msgid="1191919378083472204">"យល់ព្រម"</string>
<string name="httpError" msgid="7956392511146698522">"មានកំហុសបណ្ដាញ។"</string>
<string name="httpErrorLookup" msgid="4711687456111963163">"រកមិនឃើញ URL ។"</string>
<string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"គ្រោងការណ៍ផ្ទៀងផ្ទាត់តំបន់បណ្ដាញមិនត្រូវបានគាំទ្រ។"</string>
@@ -185,7 +185,7 @@
<string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"បើកសំឡេង"</string>
<string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"ពេលជិះយន្តហោះ"</string>
<string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"បានបើករបៀបពេលជិះយន្តហោះ"</string>
- <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"បានបិទរបៀបពេលជិះយន្តហោះ"</string>
+ <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"បានបិទរបៀបពេលជិះយន្តហោះ"</string>
<string name="global_action_settings" msgid="1756531602592545966">"ការកំណត់"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ចាក់សោឥឡូវនេះ"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
@@ -198,7 +198,7 @@
<string name="permgrouplab_messages" msgid="7521249148445456662">"សាររបស់អ្នក"</string>
<string name="permgroupdesc_messages" msgid="7821999071003699236">"អាន និងសរសេរសារ SMS, អ៊ីមែល និងសារផ្សេងៗទៀតរបស់អ្នក។"</string>
<string name="permgrouplab_personalInfo" msgid="3519163141070533474">"ព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នក"</string>
- <string name="permgroupdesc_personalInfo" msgid="8426453129788861338">"ចូលដំណើរការព័ត៌មានដោយផ្ទាល់អំពីអ្នក ដែលបានរក្សាទុកក្នុងកាតទំនាក់ទំនងរបស់អ្នក។"</string>
+ <string name="permgroupdesc_personalInfo" msgid="8426453129788861338">"ចូលដំណើរការព័ត៌មានដោយផ្ទាល់អំពីអ្នក ដែលបានរក្សាទុកក្នុងកាតទំនាក់ទំនងរបស់អ្នក។"</string>
<string name="permgrouplab_socialInfo" msgid="5799096623412043791">"ព័ត៌មានសង្គមរបស់អ្នក"</string>
<string name="permgroupdesc_socialInfo" msgid="7129842457611643493">"ចូលដំណើរការព័ត៌មានដោយផ្ទាល់អំពីទំនាក់ទំនង និងការភ្ជាប់សង្គមរបស់អ្នក។"</string>
<string name="permgrouplab_location" msgid="635149742436692049">"ទីតាំងរបស់អ្នក"</string>
@@ -391,7 +391,7 @@
<string name="permdesc_readInputState" msgid="8387754901688728043">"ឲ្យកម្មវិធីមើលគ្រាប់ចុចដែលអ្នកចុចពេលមានអន្តរកម្មជាមួយកម្មវិធីផ្សេង (ដូចជា បញ្ចូលពាក្យសម្ងាត់)។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_bindInputMethod" msgid="3360064620230515776">"ចងទៅវិធីសាស្ត្របញ្ចូល"</string>
<string name="permdesc_bindInputMethod" msgid="3250440322807286331">"ឲ្យម្ចាស់ចងចំណុចប្រទាក់កម្រិតកំពូលនៃវិធីសាស្ត្របញ្ចូល។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
- <string name="permlab_bindAccessibilityService" msgid="5357733942556031593">"ចងសេវាកម្មភាពមធ្យោបាយងាយស្រួល"</string>
+ <string name="permlab_bindAccessibilityService" msgid="5357733942556031593">"ចងសេវាកម្មភាពមធ្យោបាយងាយស្រួល"</string>
<string name="permdesc_bindAccessibilityService" msgid="7034615928609331368">"ឲ្យម្ចាស់ចងចំណុចប្រទាក់កម្រិតកំពូលនៃសេវាកម្មភាពងាយស្រួល។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_bindPrintService" msgid="8462815179572748761">"ចងសេវាកម្មបោះពុម្ព"</string>
<string name="permdesc_bindPrintService" msgid="7960067623209111135">"ឲ្យម្ចាស់ចងចំណុចប្រទាក់កម្រិតកំពូលនៃសេវាកម្មធាតុក្រាហ្វិក។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
@@ -411,7 +411,7 @@
<string name="permdesc_manageVoiceKeyphrases" msgid="8476560722907530008">"អនុញ្ញាតឲ្យម្ចាស់គ្រប់គ្រងឃ្លាសម្រាប់ការរកឃើញពាក្យជាសំឡេង។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_bindRemoteDisplay" msgid="1782923938029941960">"ភ្ជាប់ទៅការបង្ហាញពីចម្ងាយ"</string>
<string name="permdesc_bindRemoteDisplay" msgid="1261242718727295981">"អនុញ្ញាតឲ្យម្ចាស់ភ្ជាប់ទៅចំណុចប្រទាក់កម្រិតកំពូលនៃការបង្ហាញពីចម្ងាយ។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
- <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"ចងសេវាកម្មធាតុក្រាហ្វិក"</string>
+ <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"ចងសេវាកម្មធាតុក្រាហ្វិក"</string>
<string name="permdesc_bindRemoteViews" msgid="4717987810137692572">"ឲ្យម្ចាស់ចងចំណុចប្រទាក់កម្រិតកំពូលនៃសេវាកម្មធាតុក្រាហ្វិក។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_bindRouteProvider" msgid="4869394607915096847">"ភ្ជាប់ទៅសេវាកម្មក្រុមហ៊ុនផ្ដល់ច្រក"</string>
<string name="permdesc_bindRouteProvider" msgid="4703804520859960329">"អនុញ្ញាតឲ្យម្ចាស់ភ្ជាប់ទៅក្រុមហ៊ុនផ្ដល់ច្រកដែលបានចុះឈ្មោះ។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
@@ -421,7 +421,7 @@
<string name="permdesc_bindTvInput" msgid="2371008331852001924">"អនុញ្ញាតឲ្យម្ចាស់ភ្ជាប់ទៅចំណុចប្រទាក់កម្រិតខ្ពស់នៃការបញ្ចូលទូរទស្សន៍។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_modifyParentalControls" msgid="4611318225997592242">"កែប្រែការត្រួតពិនិត្យមាតាបិតា"</string>
<string name="permdesc_modifyParentalControls" msgid="7438482894162282039">"អនុញ្ញាតឲ្យម្ចាស់កែប្រែទិន្នន័យការត្រួតពិនិត្យមាតាបិតារបស់ប្រព័ន្ធ។ គួរតែមិនត្រូវការសម្រាប់កម្មវិធីធម្មតា។"</string>
- <string name="permlab_manageDeviceAdmins" msgid="4248828900045808722">"បន្ថែម ឬលុបកម្មវិធីគ្រប់គ្រងឧបករណ៍"</string>
+ <string name="permlab_manageDeviceAdmins" msgid="4248828900045808722">"បន្ថែម ឬលុបកម្មវិធីគ្រប់គ្រងឧបករណ៍"</string>
<string name="permdesc_manageDeviceAdmins" msgid="5025608167709942485">"អនុញ្ញាតឲ្យម្ចាស់បន្ថែម ឬលុបកម្មវិធីគ្រប់គ្រងឧបករណ៍សកម្មចេញ។ មិនគួរប្រើសម្រាប់កម្មវិធីធម្មតាទេ។"</string>
<string name="permlab_setOrientation" msgid="3365947717163866844">"ប្ដូរទិសអេក្រង់"</string>
<string name="permdesc_setOrientation" msgid="3046126619316671476">"ឲ្យកម្មវិធីប្ដូរការបង្វិលអេក្រង់នៅពេលណាមួយ។ មិនចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string>
@@ -433,9 +433,9 @@
<string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"ឲ្យកម្មវិធីស្នើសញ្ញាដែលបានផ្ដល់ត្រូវផ្ញើទៅដំណើរការស្ថិតស្ថេរទាំងអស់។"</string>
<string name="permlab_persistentActivity" msgid="8841113627955563938">"ធ្វើឲ្យកម្មវិធីដំណើរការជានិច្ច"</string>
<string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ឲ្យកម្មវិធីធ្វើជាផ្នែកស្ថិតស្ថេរដោយខ្លួនឯងក្នុងអង្គចងចាំ។ វាអាចកំណត់អង្គចងចាំដែលអាចប្រើបានចំពោះកម្មវិធីផ្សេងៗ ដោយធ្វើឲ្យកុំព្យូទ័របន្ទះយឺត។"</string>
- <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"ឲ្យកម្មវិធី ធ្វើជាផ្នែកអចិន្ត្រៃយ៍នៃខ្លួនក្នុងអង្គចងចាំ។ វាអាចកម្រិតអង្គចងចាំអាចប្រើបាន ដើម្បីធ្វើឲ្យកម្មវិធីផ្សេងធ្វើឲ្យទូរស័ព្ទរបស់អ្នកយឺត។"</string>
+ <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"ឲ្យកម្មវិធី ធ្វើជាផ្នែកអចិន្ត្រៃយ៍នៃខ្លួនក្នុងអង្គចងចាំ។ វាអាចកម្រិតអង្គចងចាំអាចប្រើបាន ដើម្បីធ្វើឲ្យកម្មវិធីផ្សេងធ្វើឲ្យទូរស័ព្ទរបស់អ្នកយឺត។"</string>
<string name="permlab_deletePackages" msgid="184385129537705938">"លុបកម្មវិធី"</string>
- <string name="permdesc_deletePackages" msgid="7411480275167205081">"ឲ្យកម្មវិធីលុបកញ្ចប់ Android ។ កម្មវិធីព្យាបាទអាចប្រើវា ដើម្បីលុបកម្មវិធីសំខាន់ៗ។ "</string>
+ <string name="permdesc_deletePackages" msgid="7411480275167205081">"ឲ្យកម្មវិធីលុបកញ្ចប់ Android ។ កម្មវិធីព្យាបាទអាចប្រើវា ដើម្បីលុបកម្មវិធីសំខាន់ៗ។"</string>
<string name="permlab_clearAppUserData" msgid="274109191845842756">"លុបទិន្នន័យរបស់កម្មវិធីផ្សេង"</string>
<string name="permdesc_clearAppUserData" msgid="4625323684125459488">"ឲ្យកម្មវិធីសម្អាតទិន្នន័យអ្នកប្រើ។"</string>
<string name="permlab_deleteCacheFiles" msgid="3128665571837408675">"លុបឃ្លាំងសម្ងាត់កម្មវិធីផ្សេងៗ"</string>
@@ -486,7 +486,7 @@
<string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"ឲ្យកម្មវិធីកែទិន្នន័យអំពីទំនាក់ទំនងរបស់អ្នកដែលបានរក្សាទុកក្នុងកុំព្យូទ័របន្ទះ រួមមានប្រេកង់ដែលអ្នកបានហៅ អ៊ីមែល ឬទាក់ទងតាមវិធីផ្សេងៗជាមួយទំនាក់ទំនងជាក់លាក់។ សិទ្ធិនេះអនុញ្ញាតឲ្យកម្មវិធីលុបទិន្នន័យទំនាក់ទំនងរបស់អ្នក។"</string>
<string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ឲ្យកម្មវិធីកែទិន្នន័យអំពីទំនាក់ទំនងរបស់អ្នកដែលបានរក្សាទុកក្នុងទូរស័ព្ទរបស់អ្នក រួមមានប្រេកង់ដែលអ្នកបានហៅ អ៊ីមែល ឬបានទាក់ទងតាមវិធីផ្សេងៗជាមួយទំនាក់ទំនាក់ជាក់លាក់។ សិទ្ធិនេះឲ្យកម្មវិធីលុបទិន្នន័យទំនាក់ទំនង។"</string>
<string name="permlab_readCallLog" msgid="3478133184624102739">"អានកំណត់ហេតុហៅ"</string>
- <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"ឲ្យកម្មវិធីអានបញ្ជីហៅកុំព្យូទ័របន្ទះរបស់អ្នក រួមមានទិន្នន័យអំពីការហៅចូល និងចេញ។ សិទ្ធិនេះអនុញ្ញាតឲ្យកម្មវិធីរក្សាទុកទិន្នន័យបញ្ជីហៅរបស់អ្នក ហើយកម្មវិធីព្យាបាទអាចចែករំលែកទិន្នន័យបញ្ជីហៅដោយមិនឲ្យអ្នកដឹង។"</string>
+ <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"ឲ្យកម្មវិធីអានបញ្ជីហៅកុំព្យូទ័របន្ទះរបស់អ្នក រួមមានទិន្នន័យអំពីការហៅចូល និងចេញ។ សិទ្ធិនេះអនុញ្ញាតឲ្យកម្មវិធីរក្សាទុកទិន្នន័យបញ្ជីហៅរបស់អ្នក ហើយកម្មវិធីព្យាបាទអាចចែករំលែកទិន្នន័យបញ្ជីហៅដោយមិនឲ្យអ្នកដឹង។"</string>
<string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"ឲ្យកម្មវិធីអានបញ្ជីហៅទូរស័ព្ទរបស់អ្នក រួមមានទិន្នន័យអំពីការហៅចូល និងចេញ។ សិទ្ធិនេះអនុញ្ញាតឲ្យកម្មវិធីរក្សាទុកទិន្នន័យបញ្ជីហៅរបស់អ្នក ហើយកម្មវិធីព្យាបាទអាចចែករំលែកទិន្នន័យបញ្ជីហៅដោយមិនឲ្យអ្នកដឹង។"</string>
<string name="permlab_writeCallLog" msgid="8552045664743499354">"សរសេរបញ្ជីហៅ"</string>
<string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ឲ្យកម្មវិធីកែបញ្ជីហៅកុំព្យូទ័របន្ទះរបស់អ្នករួមមានទិន្នន័យអំពីការហៅចូល និងចេញ។កម្មវិធីព្យាបាទអាចប្រើវា ដើម្បីលុប ឬកែបញ្ជីហៅរបស់អ្នក។"</string>
@@ -622,7 +622,7 @@
<string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"ឲ្យកម្មវិធីកំណត់ជំនួយទំហំផ្ទាំងរូបភាពប្រព័ន្ធ។"</string>
<string name="permlab_masterClear" msgid="2315750423139697397">"កំណត់ប្រព័ន្ធទៅលំនាំដើមរោងចក្រឡើងវិញ"</string>
<string name="permdesc_masterClear" msgid="3665380492633910226">"ឲ្យកម្មវិធីកំណត់ប្រព័ន្ធដូចការកំណត់ចេញពីរោងចក្រឡើងវិញពេញលេញ ដោយលុបទិន្នន័យ ការកំណត់រចនាសម្ព័ន្ធ និងកម្មវិធីបានដំឡើង។"</string>
- <string name="permlab_setTime" msgid="2021614829591775646">"កំណត់ម៉ោង"</string>
+ <string name="permlab_setTime" msgid="2021614829591775646">"កំណត់ម៉ោង"</string>
<string name="permdesc_setTime" product="tablet" msgid="1896341438151152881">"ឲ្យកម្មវិធីប្ដូរម៉ោងកុំព្យូទ័របន្ទះ។"</string>
<string name="permdesc_setTime" product="default" msgid="1855702730738020">"ឲ្យកម្មវិធីប្ដូរម៉ោងទូរស័ព្ទ។"</string>
<string name="permlab_setTimeZone" msgid="2945079801013077340">"កំណត់តំបន់ពេលវេលា"</string>
@@ -713,9 +713,13 @@
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"ចូលដំណើរការប្រព័ន្ធឯកសារឃ្លាំងសម្ងាត់"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ឲ្យកម្មវិធីអាន និងសរសេរប្រព័ន្ធឯកសារឃ្លាំងសម្ងាត់។"</string>
<string name="permlab_use_sip" msgid="2052499390128979920">"បង្កើត/ទទួល ការហៅ SIP"</string>
- <string name="permdesc_use_sip" msgid="2297804849860225257">"អនុញ្ញាតឲ្យកម្មវិធី បង្កើត និងទទួលការហៅ SIP ។"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"ឲ្យកម្មវិធី បង្កើត និងទទួលការហៅ SIP ។"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ទាក់ទងជាមួយអេក្រង់ហៅចូល"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ឲ្យកម្មវិធីពិនិត្យពេលវេលា និងវិធីដែលអ្នកប្រើមើលឃើញអេក្រង់ហៅចូល។"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"អានការប្រើបណ្ដាញពិសេស"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"ឲ្យកម្មវិធីអានការប្រើបណ្ដាញជាប្រវត្តិសាស្ត្រសម្រាប់បណ្ដាញ និងកម្មវិធីជាក់លាក់។"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"គ្រប់គ្រងគោលនយោបាយបណ្ដាញ"</string>
@@ -797,7 +801,7 @@
<string-array name="organizationTypes">
<item msgid="7546335612189115615">"កន្លែងធ្វើការ"</item>
<item msgid="4378074129049520373">"ផ្សេងៗ"</item>
- <item msgid="3455047468583965104">"តាមតម្រូវការ"</item>
+ <item msgid="3455047468583965104">"តាមតម្រូវការ"</item>
</string-array>
<string-array name="imProtocols">
<item msgid="8595261363518459565">"AIM"</item>
@@ -813,7 +817,7 @@
<string name="phoneTypeHome" msgid="2570923463033985887">"ផ្ទះ"</string>
<string name="phoneTypeMobile" msgid="6501463557754751037">"ចល័ត"</string>
<string name="phoneTypeWork" msgid="8863939667059911633">"កន្លែងធ្វើការ"</string>
- <string name="phoneTypeFaxWork" msgid="3517792160008890912">"ទូរសារកន្លែងធ្វើការ"</string>
+ <string name="phoneTypeFaxWork" msgid="3517792160008890912">"ទូរសារកន្លែងធ្វើការ"</string>
<string name="phoneTypeFaxHome" msgid="2067265972322971467">"ទូរសារផ្ទះ"</string>
<string name="phoneTypePager" msgid="7582359955394921732">"ភេយ័រ"</string>
<string name="phoneTypeOther" msgid="1544425847868765990">"ផ្សេងៗ"</string>
@@ -940,7 +944,7 @@
<string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"ព្យាយាមលំនាំច្រើនពេក"</string>
<string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"ដើម្បីដោះសោ ចូលគណនី Google របស់អ្នក។"</string>
<string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"ឈ្មោះអ្នកប្រើ (អ៊ីមែល)"</string>
- <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"ពាក្យសម្ងាត់"</string>
+ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"ពាក្យសម្ងាត់"</string>
<string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ចូល"</string>
<string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"ឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។"</string>
<string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"ភ្លេចឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់របស់អ្នក?\nមើល "<b>"google.com/accounts/recovery"</b>" ។"</string>
@@ -985,7 +989,7 @@
<string name="factorytest_failed" msgid="5410270329114212041">"បានបរាជ័យក្នុងការសាកល្បងរោងចក្រ"</string>
<string name="factorytest_not_system" msgid="4435201656767276723">"សកម្មភាព FACTORY_TEST ត្រូវបានគាំទ្រសម្រាប់តែកញ្ចប់បានដំឡើងក្នុង /system/app."</string>
<string name="factorytest_no_action" msgid="872991874799998561">"រកមិនឃើញកញ្ចប់ដែលផ្ដល់សកម្មភាព FACTORY_TEST ។"</string>
- <string name="factorytest_reboot" msgid="6320168203050791643">"ចាប់ផ្ដើមឡើងវិញ"</string>
+ <string name="factorytest_reboot" msgid="6320168203050791643">"ចាប់ផ្ដើមឡើងវិញ"</string>
<string name="js_dialog_title" msgid="1987483977834603872">"ទំព័រមានចំណងជើង \"<xliff:g id="TITLE">%s</xliff:g>\" សរសេរ៖"</string>
<string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string>
<string name="js_dialog_before_unload_title" msgid="2619376555525116593">"បញ្ជាក់ការរុករក"</string>
@@ -1047,7 +1051,7 @@
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ម៉ឺនុយ +"</string>
<string name="menu_space_shortcut_label" msgid="2410328639272162537">"ដកឃ្លា"</string>
<string name="menu_enter_shortcut_label" msgid="2743362785111309668">"enter"</string>
- <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"លុប"</string>
+ <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"លុប"</string>
<string name="search_go" msgid="8298016669822141719">"ស្វែងរក"</string>
<string name="searchview_description_search" msgid="6749826639098512120">"ស្វែងរក"</string>
<string name="searchview_description_query" msgid="5911778593125355124">"ស្វែងរកសំណួរ"</string>
@@ -1131,18 +1135,18 @@
<string name="preposition_for_date" msgid="9093949757757445117">"នៅ <xliff:g id="DATE">%s</xliff:g>"</string>
<string name="preposition_for_time" msgid="5506831244263083793">"នៅម៉ោង <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="preposition_for_year" msgid="5040395640711867177">"ក្នុងឆ្នាំ <xliff:g id="YEAR">%s</xliff:g>"</string>
- <string name="day" msgid="8144195776058119424">"ថ្ងៃ"</string>
+ <string name="day" msgid="8144195776058119424">"ថ្ងៃ"</string>
<string name="days" msgid="4774547661021344602">"ថ្ងៃ"</string>
<string name="hour" msgid="2126771916426189481">"ម៉ោង"</string>
<string name="hours" msgid="894424005266852993">"ម៉ោង"</string>
- <string name="minute" msgid="9148878657703769868">"នាទី"</string>
+ <string name="minute" msgid="9148878657703769868">"នាទី"</string>
<string name="minutes" msgid="5646001005827034509">"នាទី"</string>
- <string name="second" msgid="3184235808021478">"វិនាទី"</string>
+ <string name="second" msgid="3184235808021478">"វិនាទី"</string>
<string name="seconds" msgid="3161515347216589235">"វិនាទី"</string>
- <string name="week" msgid="5617961537173061583">"សប្ដាហ៍"</string>
- <string name="weeks" msgid="6509623834583944518">"សប្ដាហ៍"</string>
- <string name="year" msgid="4001118221013892076">"ឆ្នាំ"</string>
- <string name="years" msgid="6881577717993213522">"ឆ្នាំ"</string>
+ <string name="week" msgid="5617961537173061583">"សប្ដាហ៍"</string>
+ <string name="weeks" msgid="6509623834583944518">"សប្ដាហ៍"</string>
+ <string name="year" msgid="4001118221013892076">"ឆ្នាំ"</string>
+ <string name="years" msgid="6881577717993213522">"ឆ្នាំ"</string>
<plurals name="duration_seconds">
<item quantity="one" msgid="6962015528372969481">"1 វិនាទី"</item>
<item quantity="other" msgid="1886107766577166786">"<xliff:g id="COUNT">%d</xliff:g> វិនាទី"</item>
@@ -1158,12 +1162,12 @@
<string name="VideoView_error_title" msgid="3534509135438353077">"បញ្ហាវីដេអូ"</string>
<string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"វីដេអូនេះមិនត្រឹមត្រូវសម្រាប់ចរន្តចូលឧបករណ៍នេះ។"</string>
<string name="VideoView_error_text_unknown" msgid="3450439155187810085">"មិនអាចចាក់វីដេអូនេះ។"</string>
- <string name="VideoView_error_button" msgid="2822238215100679592">"យល់ព្រម"</string>
+ <string name="VideoView_error_button" msgid="2822238215100679592">"យល់ព្រម"</string>
<string name="relative_time" msgid="1818557177829411417">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
<string name="noon" msgid="7245353528818587908">"រសៀល"</string>
<string name="Noon" msgid="3342127745230013127">"រសៀល"</string>
<string name="midnight" msgid="7166259508850457595">"កណ្ដាលអធ្រាត្រ"</string>
- <string name="Midnight" msgid="5630806906897892201">"កណ្ដាលអធ្រាត្រ"</string>
+ <string name="Midnight" msgid="5630806906897892201">"កណ្ដាលអធ្រាត្រ"</string>
<string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
<string name="selectAll" msgid="6876518925844129331">"ជ្រើសទាំងអស់"</string>
@@ -1180,13 +1184,13 @@
<string name="inputMethod" msgid="1653630062304567879">"វិធីសាស្ត្របញ្ចូល"</string>
<string name="editTextMenuTitle" msgid="4909135564941815494">"សកម្មភាពអត្ថបទ"</string>
<string name="low_internal_storage_view_title" msgid="5576272496365684834">"អស់ទំហំផ្ទុក"</string>
- <string name="low_internal_storage_view_text" msgid="6640505817617414371">"មុខងារប្រព័ន្ធមួយចំនួនអាចមិនដំណើរការ"</string>
+ <string name="low_internal_storage_view_text" msgid="6640505817617414371">"មុខងារប្រព័ន្ធមួយចំនួនអាចមិនដំណើរការ"</string>
<string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> កំពុងដំណើរការ"</string>
<string name="app_running_notification_text" msgid="4653586947747330058">"ប៉ះ ដើម្បីមើលព័ត៌មានបន្ថែម ឬបញ្ឈប់កម្មវិធី។"</string>
- <string name="ok" msgid="5970060430562524910">"យល់ព្រម"</string>
- <string name="cancel" msgid="6442560571259935130">"បោះបង់"</string>
- <string name="yes" msgid="5362982303337969312">"យល់ព្រម"</string>
- <string name="no" msgid="5141531044935541497">"បោះបង់"</string>
+ <string name="ok" msgid="5970060430562524910">"យល់ព្រម"</string>
+ <string name="cancel" msgid="6442560571259935130">"បោះបង់"</string>
+ <string name="yes" msgid="5362982303337969312">"យល់ព្រម"</string>
+ <string name="no" msgid="5141531044935541497">"បោះបង់"</string>
<string name="dialog_alert_title" msgid="2049658708609043103">"ប្រយ័ត្ន"</string>
<string name="loading" msgid="7933681260296021180">"កំពុងផ្ទុក..."</string>
<string name="capital_on" msgid="1544682755514494298">"បើក"</string>
@@ -1204,7 +1208,7 @@
<string name="whichHomeApplication" msgid="4616420172727326782">"ជ្រើសកម្មវិធីដើម"</string>
<string name="alwaysUse" msgid="4583018368000610438">"ប្រើតាមលំនាំដើមសម្រាប់សកម្មភាពនេះ។"</string>
<string name="clearDefaultHintMsg" msgid="3252584689512077257">"សម្អាតលំនាំដើមក្នុងការកំណត់ប្រព័ន្ធ > កម្មវិធី > ទាញយក។"</string>
- <string name="chooseActivity" msgid="7486876147751803333">"ជ្រើសសកម្មភាព"</string>
+ <string name="chooseActivity" msgid="7486876147751803333">"ជ្រើសសកម្មភាព"</string>
<string name="chooseUsbActivity" msgid="6894748416073583509">"ជ្រើសកម្មវិធីសម្រាប់ឧបករណ៍យូអេសប៊ី"</string>
<string name="noApplications" msgid="2991814273936504689">"គ្មានកម្មវិធីអាចអនុវត្តសកម្មភាពនេះ។"</string>
<string name="aerr_title" msgid="1905800560317137752"></string>
@@ -1215,7 +1219,7 @@
<string name="anr_activity_process" msgid="5776209883299089767">"សកម្មភាព <xliff:g id="ACTIVITY">%1$s</xliff:g> មិនឆ្លើយតប។\n\nតើអ្នកចង់បិទវា?"</string>
<string name="anr_application_process" msgid="8941757607340481057">"<xliff:g id="APPLICATION">%1$s</xliff:g> មិនឆ្លើយតប។ តើអ្នកចង់បិទវា?"</string>
<string name="anr_process" msgid="6513209874880517125">"ដំណើរការ <xliff:g id="PROCESS">%1$s</xliff:g> មិនឆ្លើយតប។ \n\nតើអ្នកចង់បិទវាឬ?"</string>
- <string name="force_close" msgid="8346072094521265605">"យល់ព្រម"</string>
+ <string name="force_close" msgid="8346072094521265605">"យល់ព្រម"</string>
<string name="report" msgid="4060218260984795706">"រាយការណ៍"</string>
<string name="wait" msgid="7147118217226317732">"រង់ចាំ"</string>
<string name="webpage_unresponsive" msgid="3272758351138122503">"ទំព័រក្លាយជាមិនឆ្លើយតប។\n\nតើអ្នកចង់បិទវា?"</string>
@@ -1297,7 +1301,7 @@
<string name="sms_short_code_details" msgid="3492025719868078457"><font fgcolor="#ffffb060">"នេះអាចកាត់លុយ"</font>" លើគណនីចល័តរបស់អ្នក។"</string>
<string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"វានឹងគិតថ្លៃសេវាកម្មលើគណនីចល័តរបស់អ្នក។"</font></string>
<string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ផ្ញើ"</string>
- <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"បោះបង់"</string>
+ <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"បោះបង់"</string>
<string name="sms_short_code_remember_choice" msgid="5289538592272218136">"ចងចាំជម្រើសរបស់ខ្ញុំ"</string>
<string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"អ្នកអាចប្ដូរវាពេលក្រោយក្នុងការកំណត់ > កម្មវិធី"</string>
<string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"អនុញ្ញាតជានិច្ច"</string>
@@ -1308,8 +1312,8 @@
<string name="sim_added_title" msgid="3719670512889674693">"បានបន្ថែមស៊ីមកាត"</string>
<string name="sim_added_message" msgid="7797975656153714319">"ចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ ដើម្បីចូលប្រើបណ្ដាញចល័ត។"</string>
<string name="sim_restart_button" msgid="4722407842815232347">"ចាប់ផ្ដើមឡើងវិញ"</string>
- <string name="time_picker_dialog_title" msgid="8349362623068819295">"កំណត់ម៉ោង"</string>
- <string name="date_picker_dialog_title" msgid="5879450659453782278">"កំណត់កាលបរិច្ឆេទ"</string>
+ <string name="time_picker_dialog_title" msgid="8349362623068819295">"កំណត់ម៉ោង"</string>
+ <string name="date_picker_dialog_title" msgid="5879450659453782278">"កំណត់កាលបរិច្ឆេទ"</string>
<string name="date_time_set" msgid="5777075614321087758">"កំណត់"</string>
<string name="date_time_done" msgid="2507683751759308828">"រួចរាល់"</string>
<string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"ថ្មី៖ "</font></string>
@@ -1387,18 +1391,18 @@
<string name="permdesc_copyProtectedData" msgid="4390697124288317831">"ឲ្យកម្មវិធីដកសេវាកម្មនៃកម្មវិធីផ្ទុកលំនាំដើម ដើម្បីចម្លងមាតិកា។ មិនសម្រាប់ប្រើដោយកម្មវិធីលំនាំដើម។"</string>
<string name="permlab_route_media_output" msgid="1642024455750414694">"នាំផ្លូវលទ្ធផលមេឌៀ"</string>
<string name="permdesc_route_media_output" msgid="4932818749547244346">"ឲ្យកម្មវិធីនាំផ្លូវលទ្ធផលមេឌៀទៅឧបករណ៍ខាងក្រៅផ្សេង។"</string>
- <string name="permlab_access_keyguard_secure_storage" msgid="7565552237977815047">"ចូលដំណើរការឧបករណ៍ផ្ទុកសុវត្ថិភាព"</string>
+ <string name="permlab_access_keyguard_secure_storage" msgid="7565552237977815047">"ចូលដំណើរការឧបករណ៍ផ្ទុកសុវត្ថិភាព"</string>
<string name="permdesc_access_keyguard_secure_storage" msgid="5866245484303285762">"ឲ្យកម្មវិធីចូលការផ្ទុកមានសុវត្ថិភាព keguard ។"</string>
<string name="permlab_control_keyguard" msgid="172195184207828387">"ពិនិត្យការបង្ហាញ និងលាក់ការការពារ"</string>
<string name="permdesc_control_keyguard" msgid="3043732290518629061">"ឲ្យកម្មវិធីគ្រប់គ្រង keguard ។"</string>
<string name="permlab_trust_listener" msgid="1765718054003704476">"ស្ដាប់ការផ្លាស់ប្ដូរស្ថានភាពដែលទុកចិត្ត។"</string>
<string name="permdesc_trust_listener" msgid="8233895334214716864">"ឲ្យកម្មវិធីស្ដាប់ការផ្លាស់ប្ដូរក្នុងស្ថានភាពដែលទុកចិត្ត។"</string>
<string name="permlab_provide_trust_agent" msgid="5465587586091358316">"ផ្ដល់ភ្នាក់ងារដែលទុកចិត្ត។"</string>
- <string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"ឲ្យកម្មវិធីផ្ដល់ភ្នាក់ងារដែលទុកចិត្ត។"</string>
+ <string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"អនុញ្ញាតឲ្យកម្មវិធីផ្ដល់ភ្នាក់ងារដែលទុកចិត្ត។"</string>
<string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"ចាប់ផ្ដើមម៉ឺនុយការកំណត់ភ្នាក់ងារដែលទុកចិត្ត"</string>
- <string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"ឲ្យកម្មវិធីចាប់ផ្ដើមសកម្មភាពដែលប្ដូរឥរិយាបថភ្នាក់ងារដែលទុកចិត្ត។"</string>
+ <string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"អនុញ្ញាតឲ្យកម្មវិធីចាប់ផ្ដើមសកម្មភាពដែលប្ដូរឥរិយាបថភ្នាក់ងារដែលទុកចិត្ត។"</string>
<string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"ភ្ជាប់ទៅសេវាកម្មភ្នាក់ងារដែលទុកចិត្ត"</string>
- <string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"ឲ្យកម្មវិធីភ្ជាប់សេវាកម្មភ្នាក់ងារដែលទុកចិត្ត។"</string>
+ <string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"អនុញ្ញាតឲ្យកម្មវិធីភ្ជាប់សេវាកម្មភ្នាក់ងារដែលទុកចិត្ត។"</string>
<string name="permlab_recovery" msgid="3157024487744125846">"អន្តរកម្មជាមួយបច្ចុប្បន្នភាព និងប្រព័ន្ធសង្គ្រោះ"</string>
<string name="permdesc_recovery" msgid="8511774533266359571">"ឲ្យកម្មវិធីមានអន្តរកម្មជាមួយប្រព័ន្ធសង្គ្រោះ និងបច្ចុប្បន្នភាពប្រព័ន្ធ។"</string>
<string name="permlab_createMediaProjection" msgid="4941338725487978112">"បង្កើតសម័យគម្រោងមេឌៀ"</string>
@@ -1410,7 +1414,7 @@
<string name="ime_action_go" msgid="8320845651737369027">"ទៅ"</string>
<string name="ime_action_search" msgid="658110271822807811">"ស្វែងរក"</string>
<string name="ime_action_send" msgid="2316166556349314424">"ផ្ញើ"</string>
- <string name="ime_action_next" msgid="3138843904009813834">"បន្ទាប់"</string>
+ <string name="ime_action_next" msgid="3138843904009813834">"បន្ទាប់"</string>
<string name="ime_action_done" msgid="8971516117910934605">"រួចរាល់"</string>
<string name="ime_action_previous" msgid="1443550039250105948">"មុន"</string>
<string name="ime_action_default" msgid="2840921885558045721">"អនុវត្ត"</string>
@@ -1419,7 +1423,7 @@
<string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"កម្មវិធីមួយ ឬច្រើនដូចខាងក្រោមស្នើសិទ្ធិ ដើម្បីចូលគណនីរបស់អ្នកឥឡូវ និងពេលអនាគត។"</string>
<string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"តើអ្នកចង់អនុញ្ញាតសំណើនេះ?"</string>
<string name="grant_permissions_header_text" msgid="6874497408201826708">"ស្នើចូល"</string>
- <string name="allow" msgid="7225948811296386551">"អនុញ្ញាត"</string>
+ <string name="allow" msgid="7225948811296386551">"អនុញ្ញាត"</string>
<string name="deny" msgid="2081879885755434506">"បដិសេធ"</string>
<string name="permission_request_notification_title" msgid="6486759795926237907">"បានស្នើសិទ្ធិ"</string>
<string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"បានស្នើសិទ្ធិ\nសម្រាប់គណនី <xliff:g id="ACCOUNT">%s</xliff:g> ។"</string>
@@ -1444,12 +1448,12 @@
<string name="no_file_chosen" msgid="6363648562170759465">"គ្មានឯកសារបានជ្រើស"</string>
<string name="reset" msgid="2448168080964209908">"កំណត់ឡើងវិញ"</string>
<string name="submit" msgid="1602335572089911941">"ដាក់ស្នើ"</string>
- <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"បានបើករបៀបរថយន្ត"</string>
+ <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"បានបើករបៀបរថយន្ត"</string>
<string name="car_mode_disable_notification_message" msgid="8035230537563503262">"ប៉ះ ដើម្បីចេញពីរបៀបរថយន្ត។"</string>
<string name="tethered_notification_title" msgid="3146694234398202601">"ភ្ជាប់ ឬហតស្ពតសកម្ម"</string>
<string name="tethered_notification_message" msgid="6857031760103062982">"ប៉ះ ដើម្បីរៀបចំ។"</string>
<string name="back_button_label" msgid="2300470004503343439">"ថយក្រោយ"</string>
- <string name="next_button_label" msgid="1080555104677992408">"បន្ទាប់"</string>
+ <string name="next_button_label" msgid="1080555104677992408">"បន្ទាប់"</string>
<string name="skip_button_label" msgid="1275362299471631819">"រំលង"</string>
<string name="no_matches" msgid="8129421908915840737">"គ្មានការផ្គូផ្គង"</string>
<string name="find_on_page" msgid="1946799233822820384">"រកក្នុងទំព័រ"</string>
@@ -1471,7 +1475,7 @@
<string name="media_shared" product="nosdcard" msgid="5830814349250834225">"ឧបករណ៍ផ្ទុកយូអេសប៊ីបច្ចុប្បន្នកំពុងប្រើដោយកុំព្យូទ័រ។"</string>
<string name="media_shared" product="default" msgid="5706130568133540435">"បច្ចុប្បន្នកាតអេសឌីកំពុងប្រើដោយកុំព្យូទ័រ"</string>
<string name="media_unknown_state" msgid="729192782197290385">"មិនស្គាល់ស្ថានភាពមេឌៀខាងក្រៅ។"</string>
- <string name="share" msgid="1778686618230011964">"ចែករំលែក"</string>
+ <string name="share" msgid="1778686618230011964">"ចែករំលែក"</string>
<string name="find" msgid="4808270900322985960">"រក"</string>
<string name="websearch" msgid="4337157977400211589">"ស្វែងរកតាមបណ្ដាញ"</string>
<string name="find_next" msgid="5742124618942193978">"រកបន្ទាប់"</string>
@@ -1487,7 +1491,7 @@
<string name="sync_undo_deletes" msgid="2941317360600338602">"មិនធ្វើការលុបវិញ"</string>
<string name="sync_do_nothing" msgid="3743764740430821845">"មិនធ្វើអ្វីទេឥឡូវ"</string>
<string name="choose_account_label" msgid="5655203089746423927">"ជ្រើសគណនី"</string>
- <string name="add_account_label" msgid="2935267344849993553">"បន្ថែមគណនីថ្មី"</string>
+ <string name="add_account_label" msgid="2935267344849993553">"បន្ថែមគណនីថ្មី"</string>
<string name="add_account_button_label" msgid="3611982894853435874">"បន្ថែមគណនី"</string>
<string name="number_picker_increment_button" msgid="2412072272832284313">"បង្កើន"</string>
<string name="number_picker_decrement_button" msgid="476050778386779067">"បន្ថយ"</string>
@@ -1508,15 +1512,15 @@
<string name="date_picker_increment_year_button" msgid="6318697384310808899">"បង្កើនឆ្នាំ"</string>
<string name="date_picker_decrement_year_button" msgid="4482021813491121717">"បន្ថយឆ្នាំ"</string>
<string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string>
- <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"បោះបង់"</string>
+ <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"បោះបង់"</string>
<string name="keyboardview_keycode_delete" msgid="3337914833206635744">"លុប"</string>
<string name="keyboardview_keycode_done" msgid="1992571118466679775">"រួចរាល់"</string>
<string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"ប្ដូររបៀប"</string>
<string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shift"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string>
- <string name="activitychooserview_choose_application" msgid="2125168057199941199">"ជ្រើសកម្មវិធី"</string>
+ <string name="activitychooserview_choose_application" msgid="2125168057199941199">"ជ្រើសកម្មវិធី"</string>
<string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"មិនអាចចាប់ផ្ដើម <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="shareactionprovider_share_with" msgid="806688056141131819">"ចែករំលែកជាមួយ"</string>
+ <string name="shareactionprovider_share_with" msgid="806688056141131819">"ចែករំលែកជាមួយ"</string>
<string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"ចែករំលែកជាមួយ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
<string name="content_description_sliding_handle" msgid="415975056159262248">"គ្រប់គ្រងការរុញ។ ប៉ះ & សង្កត់។"</string>
<string name="description_target_unlock_tablet" msgid="3833195335629795055">"អូស ដើម្បីដោះសោ។"</string>
@@ -1530,7 +1534,7 @@
<string name="storage_internal" msgid="4891916833657929263">"ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
<string name="storage_sd_card" msgid="3282948861378286745">"កាតអេសឌី"</string>
<string name="storage_usb" msgid="3017954059538517278">"ឧបករណ៍ផ្ទុកយូអេសប៊ី"</string>
- <string name="extract_edit_menu_button" msgid="8940478730496610137">"កែសម្រួល"</string>
+ <string name="extract_edit_menu_button" msgid="8940478730496610137">"កែសម្រួល"</string>
<string name="data_usage_warning_title" msgid="1955638862122232342">"ការព្រមានប្រើទិន្នន័យ"</string>
<string name="data_usage_warning_body" msgid="2814673551471969954">"ប៉ះ ដើម្បីមើលការប្រើ និងការកំណត់។"</string>
<string name="data_usage_3g_limit_title" msgid="4462365924791862301">"ទិន្នន័យ 2G-3G បានបិទ"</string>
@@ -1588,7 +1592,7 @@
<string name="media_route_status_available" msgid="6983258067194649391">"ទំនេរ"</string>
<string name="media_route_status_not_available" msgid="6739899962681886401">"មិនទំនេរ"</string>
<string name="media_route_status_in_use" msgid="4533786031090198063">"កំពុងប្រើ"</string>
- <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"អេក្រង់ជាប់"</string>
+ <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"អេក្រង់ជាប់"</string>
<string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"អេក្រង់ HDMI"</string>
<string name="display_manager_overlay_display_name" msgid="5142365982271620716">"#<xliff:g id="ID">%1$d</xliff:g> ត្រួតគ្នា"</string>
<string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g>x<xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi"</string>
@@ -1620,7 +1624,7 @@
<string name="kg_login_too_many_attempts" msgid="6486842094005698475">"ព្យាយាមលំនាំច្រើនពេក"</string>
<string name="kg_login_instructions" msgid="1100551261265506448">"ដើម្បីដោះសោ ចូលក្នុងគណនី Google ។"</string>
<string name="kg_login_username_hint" msgid="5718534272070920364">"ឈ្មោះអ្នកប្រើ (អ៊ីម៉ែល)"</string>
- <string name="kg_login_password_hint" msgid="9057289103827298549">"ពាក្យសម្ងាត់"</string>
+ <string name="kg_login_password_hint" msgid="9057289103827298549">"ពាក្យសម្ងាត់"</string>
<string name="kg_login_submit_button" msgid="5355904582674054702">"ចូល"</string>
<string name="kg_login_invalid_input" msgid="5754664119319872197">"ឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។"</string>
<string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"ភ្លេចឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់របស់អ្នក?\nមើល "<b>"google.com/accounts/recovery"</b>" ។"</string>
@@ -1729,7 +1733,7 @@
<string name="mediasize_japanese_you4" msgid="2091777168747058008">"You4"</string>
<string name="mediasize_unknown_portrait" msgid="3088043641616409762">"មិនស្គាល់បញ្ឈរ"</string>
<string name="mediasize_unknown_landscape" msgid="4876995327029361552">"មិនស្គាល់ទេសភាព"</string>
- <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"បានបោះបង់"</string>
+ <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"បានបោះបង់"</string>
<string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"កំហុសក្នុងការសរសេរមាតិកា"</string>
<string name="reason_unknown" msgid="6048913880184628119">"មិនស្គាល់"</string>
<string name="reason_service_unavailable" msgid="7824008732243903268">"មិនបានបើកសេវាកម្មបោះពុម្ព"</string>
@@ -1762,530 +1766,31 @@
<string name="item_is_selected" msgid="949687401682476608">"បានជ្រើស <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"បានលុប <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"កន្លែងធ្វើការ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"អ្នកគឺនៅក្នុងរបៀបចាក់សោទៅកម្មវិធី។ ដើម្បីចេញពី, ប៉ះ និងសង្កត់ប៊ូតុងថ្មីៗ"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"អ្នកស្ថិតក្នុងរបៀបចាក់សោទៅកម្មវិធី។"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ប្រើការចាក់សោកម្មវិធី?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"ចាក់សោទៅកម្មវិធីបង្ហាញនៅក្នុងកម្មវិធីតែមួយ។\n\nដើម្បីចេញពី, ប៉ះ និងសង្កត់ប៊ូតុងថ្មីៗ។"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ទេ, អរគុណ!"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ចាប់ផ្ដើម"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"បានចាក់សោសម្រាប់កម្មវិធី"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"មិនបានចាក់សោសម្រាប់កម្មវិធីទៀតឡើយ"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"សួរ %1$s មុនពេលចាកចេញ"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"កូដ PIN"</string>
- <string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"លំនាំដោះសោ"</string>
+ <string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"លំនាំដោះសោ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"ពាក្យសម្ងាត់"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"នេះជាគោលការណ៍ណែនាំមាតាបិតាតាមទូរទស្សន៍"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ការពិគ្រោះយោបល់ (ជាធម្មតាមានន័យថាការពិភាក្សាអំពីផ្លូវភេទ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ភាសាអាក្រក់"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"មាតិកាផ្លូវភេទ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"អំពើហិង្សា"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"អំពើហិង្សាធ្ងន់ធ្ងរ (ការសរសេរកម្មវិធីរបស់កុមារប៉ុណ្ណោះ)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml
index e224c7e..2e5fbee 100644
--- a/core/res/res/values-kn-rIN/strings.xml
+++ b/core/res/res/values-kn-rIN/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"ಸಂಗ್ರಹಿತ ಫೈಲ್ ಸಿಸ್ಟಂ ಅನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ಕ್ಯಾಷ್ ಫೈಲ್ ವ್ಯವಸ್ಥೆಯನ್ನು ಓದಲು ಮತ್ತು ಬರೆಯಲು ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಸುತ್ತದೆ."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP ಕರೆಗಳನ್ನು ಮಾಡಿ/ಸ್ವೀಕರಿಸಿ"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ಒಳ-ಕರೆ ಪರದೆಯ ಮೂಲಕ ಸಂವಹನ ನಡೆಸಿ"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ಬಳಕೆದಾರರು ಒಳ-ಕರೆಯ ಪರದೆಯನ್ನು ಯಾವಾಗ ಮತ್ತು ಹೇಗೆ ನೋಡುತ್ತಾರೆ ಎಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ಐತಿಹಾಸಿಕ ನೆಟ್ವರ್ಕ್ ಬಳಕೆಯನ್ನು ಓದಿರಿ"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"ನಿರ್ದಿಷ್ಟ ನೆಟ್ವರ್ಕ್ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಐತಿಹಾಸಿಕ ನೆಟ್ವರ್ಕ್ನ ಬಳಕೆಯನ್ನು ಓದಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ನೆಟ್ವರ್ಕ್ ನೀತಿಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ಅಳಿಸಲಾಗಿದೆ"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"ಕೆಲಸ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"ನೀವು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಲಾಕ್ ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ನಿರ್ಗಮಿಸಲು, ಇತ್ತೀಚಿನವು ಬಟನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿಹಿಡಿಯಿರಿ"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"ನೀವು ಅಪ್-ಗೆ-ಲಾಕ್ ಮೋಡ್ನಲ್ಲಿರುವಿರಿ."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ಅಪ್-ಗೆ-ಲಾಕ್ ಬಳಸುವುದೇ?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"ಅಪ್ಲಿಕೇಶನ್ಗೆ ಲಾಕ್ ಎಂಬುದು ಒಂದು ಅಪ್ಲಿಕೇಶನ್ನಲ್ಲಿನ ಪ್ರದರ್ಶನವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.\n\nನಿರ್ಗಮಿಸಲು, ಇತ್ತೀಚಿನವು ಬಟನ್ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿಹಿಡಿಯಿರಿ."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ಪ್ರಾರಂಭಿಸು"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"ಅಪ್ಲಿಕೇಶನ್ಗೆ ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"ಅಪ್ಲಿಕೇಶನ್ಗೆ ಇನ್ನು ಮುಂದೆ ಲಾಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"ನಿರ್ಗಮಿಸುವ ಮೊದಲು %1$s ಗಾಗಿ ಕೇಳಿ"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ಅನ್ಲಾಕ್ ನಮೂನೆ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"ಪಾಸ್ವರ್ಡ್"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV ಪೋಷಕರ ಮಾರ್ಗಸೂಚಿಗಳು"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ಸೂಚಿತ ಸಂಭಾಷಣೆ (ಸಾಮಾನ್ಯವಾಗಿ ಲೈಂಗಿಕತೆ ಬಗ್ಗೆ ಮಾತುಕತೆ ಎಂದರ್ಥ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ಒರಟು ಭಾಷೆ"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"ಲೈಂಗಿಕ ವಿಷಯ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ಹಿಂಸೆ"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ಕಾಲ್ಪನಿಕ ಹಿಂಸೆ (ಮಕ್ಕಳ ಕಾರ್ಯಕ್ರಮ ಮಾತ್ರ)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 1f343ae..55ae682 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"발신자 번호"</string>
<string name="ClirMmi" msgid="7784673673446833091">"내 발신 번호"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"환승편 ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"환승편 ID 제한"</string>
<string name="CfMmi" msgid="5123218989141573515">"착신전환"</string>
<string name="CwMmi" msgid="9129678056795016867">"통화중 대기"</string>
<string name="BaMmi" msgid="455193067926770581">"착발신 제한"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"앱이 모든 사용자의 외부 저장소에 액세스하도록 허용합니다."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"캐시 파일시스템 액세스"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"앱이 캐시 파일 시스템을 읽고 쓸 수 있도록 허용합니다."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP 통화 발신/수신"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"앱에서 SIP 통화를 발신 및 수신하도록 허용"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"통화 화면과 상호 작용"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"앱에서 사용자가 통화 화면을 보는 시기와 방법을 제어하도록 허용합니다."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"이전 네트워크 사용량 읽기"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"앱이 특정 네트워크 및 앱에 대한 이전 네트워크 사용량을 읽을 수 있도록 허용합니다."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"네트워크 정책 관리"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM 카드가 없거나 읽을 수 없습니다. SIM 카드를 삽입하세요."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"사용할 수 없는 SIM 카드입니다."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"SIM 카드 사용이 영구적으로 사용중지되었습니다.\n다른 SIM 카드를 사용하려면 무선 서비스 제공업체에 문의하시기 바랍니다."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"이전 트랙"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"다음 트랙"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"일시중지"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"재생"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"중지"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"되감기"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"빨리 감기"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"긴급 통화만"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"네트워크 잠김"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 카드가 PUK 잠김 상태입니다."</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"\'시간\'을 줄입니다."</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM 설정"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM 설정"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"오후"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"오전"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"\'월\'을 늘립니다."</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"\'월\'을 줄입니다."</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"\'일\'을 늘립니다."</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g>이(가) 선택됨"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> 삭제됨"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"업무용 <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"앱 잠금 기능을 사용 중입니다. 종료하려면 최근 버튼을 길게 터치하세요."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"앱 잠금 기능을 사용 중입니다."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"앱 잠금 기능을 사용하시겠습니까?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"앱 잠금 기능은 단일 앱의 화면을 잠급니다.\n\n종료하려면 최근 버튼을 길게 터치합니다."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"아니요"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"시작"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"앱 잠금 기능 사용"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"앱 잠금 기능 사용 안함"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"종료 전에 %1$s 요청"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"잠금해제 패턴"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"비밀번호"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV-PG"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"선정적 대화(주로 성적인 내용)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"거친 언어"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"성적인 콘텐츠"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"폭력"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"판타지 폭력(아동 프로그램에만 해당)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml
index e18ddf8..2b66d13 100644
--- a/core/res/res/values-ky-rKG/strings.xml
+++ b/core/res/res/values-ky-rKG/strings.xml
@@ -922,12 +922,14 @@
<!-- no translation found for permlab_cache_filesystem (5656487264819669824) -->
<skip />
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Колдонмого кэш файл тутумун окуу жана жазуу мүмкүнчүлүгүн берет."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP чалууларын жасоо/кабыл алуу"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Колдонмонун SIP чалууларын жасап жана кабыл алуусуна жол ачат."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"чалуу экраны менен байланыштыруу"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Колдонмого чалуу экранын колдонуучу качан жана кандай көрөөрүн башкаруу мүмкүнчүлүгүн берет."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<!-- no translation found for permlab_readNetworkUsageHistory (7862593283611493232) -->
<skip />
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Колдонмого белгилүү бир тармактарга жана колдонмолорго байланыштуу тармактын колдонулушу жөнүндө таржымалды окуу мүмкүнчүлүгүн берет."</string>
@@ -2243,530 +2245,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> тандалды"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> өчүрүлдү"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Жумуш <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Колдонмого кулптап коюу режиминдесиз. Чыгуу үчүн, Акыркылар баскычын коё бербей басып туруңуз."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Колдонмого-кулптап-коюу режиминдесиз."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Кулпулоо колдонмосун иштетесизби?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Колдонмого-кулптап-коюу бир колдонмонун экранын кулптайт.\n\nЧыгуу үчүн, Акыркылар баскычын коё бербей басып туруңуз."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ЖОК, РАХМАТ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"БАШТОО"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Колдонмого кулптанган"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Колдонмого кулптанбай калды"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Чыгуудан мурун %1$s сураңыз"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"бөгөттөн чыгаруу үлгүсү"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"сырсөз"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Сыналгынын ата-энелик көрсөтмөлөрү"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Адепсиз диалог (Адатта, секс жөнүндө сүйлөшүүлөр)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Орой тил"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Сексуалдык мазмун"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Зомбулук"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Фантастикалык зомбулук (Балдардын программалоосу гана)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml
index b817a9d..7372528 100644
--- a/core/res/res/values-lo-rLA/strings.xml
+++ b/core/res/res/values-lo-rLA/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"ອະນຸຍາດໃຫ້ແອັບຯ ເຂົ້າເຖິງພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍນອກ ສຳລັບທຸກຜູ່ໃຊ້."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"ເຂົ້າເຖິງໄຟລ໌ cache ຂອງລະບົບ"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ອະນຸຍາດໃຫ້ແອັບຯ ອ່ານ ແລະຂຽນ ລະບົບໄຟລ໌ແຄດ."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"ຮັບສາຍ/ໂທອອກ ຜ່ານ SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"ອະນຸຍາດໃຫ້ແອັບຯສາມາດຮັບສາຍ ແລະໂທອອກຜ່ານ SIP ໄດ້"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ໂຕ້ຕອບກັບໜ້າຈໍການໂທ"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ອະນຸຍາດໃຫ້ແອັບຯ ຄວບຄຸມເວລາ ແລະວິທີການທີ່ຜູ່ໃຊ້ເຫັນໜ້າຈໍການໂທໄດ້."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ອ່ານປະຫວັດການນຳໃຊ້ເຄືອຂ່າຍ"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"ອະນຸຍາດໃຫ້ແອັບຯ ອ່ານປະຫວັດການນຳໃຊ້ເຄືອຂ່າຍຂອງແອັບຯ ແລະເຄືອຂ່າຍໃດນຶ່ງ."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ຈັດການນະໂຍບາຍເຄືອຂ່າຍ"</string>
@@ -1741,7 +1743,7 @@
<string name="restr_pin_enter_old_pin" msgid="1462206225512910757">"PIN ປະຈຸບັນ"</string>
<string name="restr_pin_enter_new_pin" msgid="5959606691619959184">"ລະຫັດ PIN ໃໝ່"</string>
<string name="restr_pin_confirm_pin" msgid="8501523829633146239">"ຢືນຢັນລະຫັດ PIN ໃໝ່"</string>
- <string name="restr_pin_create_pin" msgid="8017600000263450337">"ສ້າງ PIN ສໍາລັບການປັບປຸງຂໍ້ຈໍາກັດ"</string>
+ <string name="restr_pin_create_pin" msgid="8017600000263450337">"ສ້າງ PIN ສໍາລັບການປັບປຸງຂໍ້ຈໍາກັດ"</string>
<string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"PIN ບໍ່ກົງກັນ. ລອງໃໝ່ອີກຄັ້ງ."</string>
<string name="restr_pin_error_too_short" msgid="8173982756265777792">"PIN ສັ້ນເກີນໄປ. ຕ້ອງມີຢ່າງໜ້ອຍ 4 ຫຼັກ."</string>
<plurals name="restr_pin_countdown">
@@ -1762,530 +1764,30 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ຖືກເລືອກແລ້ວ"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ຖືກລຶບແລ້ວ"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"ບ່ອນເຮັດວຽກ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"ທ່ານຢູ່ໃນໂໝດ lock-to-app ຢູ່. ເພື່ອອກ, ໃຫ້ແຕະປຸ່ມ \"ແອັບຯເມື່ອໄວໆນີ້\" ຄ້າງໄວ້"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"ທ່ານຢູ່ໃນໂໝດ Lock-to-App."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ນຳໃຊ້ lock-to-app ບໍ່?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Lock-to-app ຈະລັອກໜ້າຈໍໄວ້ໃນແອັບຯດ່ຽວໃດນຶ່ງ.\n\nເພື່ອອກ, ໃຫ້ແຕະປຸ່ມ \"ແອັບຯເມື່ອໄວໆນີ້\" ຄ້າງໄວ້."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ບໍ່, ຂອບໃຈ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ເລີ່ມ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"ລັອກສະເພາະແອັບຯແລ້ວ"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"ບໍ່ໄດ້ລັອກສະເພາະແອັບຯແລ້ວ"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"ຖາມ %1$s ກ່ອນອອກ"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ຮູບແບບປົດລັອກ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"ລະຫັດຜ່ານ"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"ຄຳແນະນຳການເບິ່ງໂທລະພາບສຳລັບຜູ່ປົກຄອງ"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ຄຳບັນຍາຍແນະນຳ (ໂດຍປົກກະຕິໝາຍເຖິງການສົນທະນາກ່ຽວກັບເພດ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ພາສາຫຍາບຄາຍ"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"ເນື້ອຫາກ່ຽວກັບເພດ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ຄວາມຮຸນແຮງ"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ຄວາມຮຸນແຮງຈິນຕະນາການ (ລາຍການສຳລັບເດັກເທົ່ານັ້ນ)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
- <!-- no translation found for battery_saver_description (725676363406667978) -->
+ <string name="battery_saver_description" msgid="725676363406667978">"ເພື່ອຊ່ວຍປັບປຸງອາຍຸແບັດເຕີຣີ, ໂຕປະຢັດແບັດເຕີຣີຈະຫຼຸດປະສິດທິພາບຂອງອຸປະກອນຂອງທ່ານລົງ ແລະຈຳກັດການສັ່ນເຕືອນ ຮວມທັງຂໍ້ມູນພື້ນຫຼັງສ່ວນໃຫຍ່. ອີເມວ, ການສົ່ງຂໍ້ຄວາມ ແລະແອັບຯອື່ນໆທີ່ອີງອາໃສການຊິ້ງຂໍ້ມູນອາດບໍ່ມີການອັບເດດຈົນກວ່າທ່ານຈະເປີດແອັບຯເຫຼົ່ານັ້ນ.\n\nໂຕປະຢັດແບັດເຕີຣີຈະປິດໂຕເອງອັດຕະໂນມັດໃນເວລາທີ່ອຸປະກອນຂອງທ່ານສາກໄຟຢູ່"</string>
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
<skip />
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 8bfad26..5d65ce3 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Leidžiama programai skambinti ir priimti SIP skambučius."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"sąveika su gaunamojo skambučio ekranu"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Programai leidžiama valdyti, kada ir kaip naudotojai matys gaunamojo skambučio ekraną."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"skaityti tinklo naudojimo istoriją"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Leidžiama programai skaityti konkrečių tinklų ir programų tinklo naudojimo istoriją."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"valdyti tinklo politiką"</string>
@@ -1760,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Pasirinkta: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Ištrinta: <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Darbo <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Įjungėte programos užrakinimo funkcijos režimą. Kad išeitumėte, palieskite ir palaikykite mygtuką „Naujausios“"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Įjungėte programos užrakinimo funkcijos režimą."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Naudoti programos užrakinimo funkciją?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Naudojant programos užrakinimo funkciją ekrane užrakinama viena programa.\n\nKad išeitumėte, palieskite ir palaikykite mygtuką „Naujausios“."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NE, AČIŪ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ĮJUNGTI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Naudojama programos užrakinimo funkcija"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Programos užrakinimo funkcija nebenaudojama"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Prieš išeinant paklausti: %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN kodas"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"atrakinimo piešinys"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"slaptažodis"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Gairės tėvams apie TV turinį"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dviprasmiškas dialogas (paprastai reiškia pokalbius apie seksą)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Nemandagi kalba"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksualinis turinys"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Smurtas"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Smurtas maginės fantastikos turinyje (tik vaikams skirtose programose)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index c0b7cec..7c07f92 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Ļauj lietotnei piekļūt visu lietotāju ārējai krātuvei."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"piekļūt kešatmiņas failu sistēmai"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Ļauj lietotnei lasīt un rakstīt kešatmiņas failu sistēmā."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP zvanu veikšana/saņemšana"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ļauj lietotnei veikt un saņemt SIP zvanus."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"mijiedarbība ar zvana laikā rādītu ekrānu"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Ļauj lietotnei kontrolēt, kad un kā lietotājam ir redzams zvana laikā redzamais ekrāns."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lasīt informāciju par iepriekšēju tīkla izmantošanu"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Ļauj lietotnei lasīt informāciju par iepriekšēju tīkla izmantošanu saistībā ar noteiktiem tīkliem un lietotnēm."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"pārvaldīt tīkla politiku"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Atlasīts: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> tika dzēsts."</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Darbā: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Jūs izmantojat režīmu “Fiksēt lietotnē”. Lai izietu, nospiediet un turiet pogu Pēdējās."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Jūs izmantojat režīmu “Bloķēšana darbībai vienā lietotnē”."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Vai izmantot funkciju \"Fiksēt lietotni\"?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Izmantojot funkciju “Fiksēt lietotni”, ekrāns tiek nobloķēts vienā lietotnē.\n\nLai izietu, nospiediet un turiet pogu Pēdējās."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NĒ, PALDIES"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"SĀKT"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Lietotne fiksēta"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Lietotne vairs nav fiksēta"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Pirms iziešanas jautāt: %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN kods"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"grafiskā atslēga"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"parole"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV vadlīnijas vecākiem"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Divdomīgs dialogs (parasti — seksuāla rakstura sarunas)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Rupja valoda"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuāla rakstura saturs"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Vardarbība"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantāzijas vardarbība (tikai bērnu programmās)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/media/java/android/media/routing/ParcelableDestinationInfo.aidl b/core/res/res/values-mcc206-mnc05/config.xml
similarity index 63%
rename from media/java/android/media/routing/ParcelableDestinationInfo.aidl
rename to core/res/res/values-mcc206-mnc05/config.xml
index bf1c198..a684aaa 100644
--- a/media/java/android/media/routing/ParcelableDestinationInfo.aidl
+++ b/core/res/res/values-mcc206-mnc05/config.xml
@@ -1,4 +1,7 @@
-/* Copyright 2014, The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -12,7 +15,10 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
+-->
-package android.media.routing;
-
-parcelable ParcelableDestinationInfo;
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>20610</item>
+ </string-array>
+</resources>
diff --git a/media/java/android/media/routing/ParcelableDestinationInfo.aidl b/core/res/res/values-mcc206-mnc10/config.xml
similarity index 63%
copy from media/java/android/media/routing/ParcelableDestinationInfo.aidl
copy to core/res/res/values-mcc206-mnc10/config.xml
index bf1c198..5c96317 100644
--- a/media/java/android/media/routing/ParcelableDestinationInfo.aidl
+++ b/core/res/res/values-mcc206-mnc10/config.xml
@@ -1,4 +1,7 @@
-/* Copyright 2014, The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -12,7 +15,10 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
+-->
-package android.media.routing;
-
-parcelable ParcelableDestinationInfo;
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>20605</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc208-mnc10/config.xml b/core/res/res/values-mcc208-mnc10/config.xml
index 358bef6..10a6c5d 100644
--- a/core/res/res/values-mcc208-mnc10/config.xml
+++ b/core/res/res/values-mcc208-mnc10/config.xml
@@ -35,4 +35,28 @@
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">SFR option modem,websfr,,,,,,,,,208,10,,DUN</string>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+
</resources>
diff --git a/media/java/android/media/routing/ParcelableDestinationInfo.aidl b/core/res/res/values-mcc208-mnc15/config.xml
similarity index 63%
copy from media/java/android/media/routing/ParcelableDestinationInfo.aidl
copy to core/res/res/values-mcc208-mnc15/config.xml
index bf1c198..32b951c 100644
--- a/media/java/android/media/routing/ParcelableDestinationInfo.aidl
+++ b/core/res/res/values-mcc208-mnc15/config.xml
@@ -1,4 +1,7 @@
-/* Copyright 2014, The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -12,7 +15,10 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
+-->
-package android.media.routing;
-
-parcelable ParcelableDestinationInfo;
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>20801</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc01/config.xml b/core/res/res/values-mcc214-mnc01/config.xml
index 1b7c462..ecd8124 100644
--- a/core/res/res/values-mcc214-mnc01/config.xml
+++ b/core/res/res/values-mcc214-mnc01/config.xml
@@ -37,4 +37,27 @@
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</string>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mcc214-mnc02/config.xml b/core/res/res/values-mcc214-mnc02/config.xml
new file mode 100755
index 0000000..c83de57
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc02/config.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+
+</resources>
diff --git a/core/res/res/values-mcc214-mnc04/config.xml b/core/res/res/values-mcc214-mnc04/config.xml
index 71301d5..6dfa87b 100644
--- a/core/res/res/values-mcc214-mnc04/config.xml
+++ b/core/res/res/values-mcc214-mnc04/config.xml
@@ -20,6 +20,25 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Don't use roaming icon for considered operators -->
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21405</item>
+ <item>21406</item>
<item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
</string-array>
</resources>
diff --git a/core/res/res/values-mcc214-mnc05/config.xml b/core/res/res/values-mcc214-mnc05/config.xml
new file mode 100755
index 0000000..9302b0c
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc05/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc06/config.xml b/core/res/res/values-mcc214-mnc06/config.xml
new file mode 100755
index 0000000..c3f2643
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc06/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc08/config.xml b/core/res/res/values-mcc214-mnc08/config.xml
new file mode 100755
index 0000000..5af6d5d
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc08/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc09/config.xml b/core/res/res/values-mcc214-mnc09/config.xml
new file mode 100755
index 0000000..d789771
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc09/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc10/config.xml b/core/res/res/values-mcc214-mnc10/config.xml
new file mode 100755
index 0000000..b66e1a2
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc10/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc11/config.xml b/core/res/res/values-mcc214-mnc11/config.xml
new file mode 100755
index 0000000..9fd06db
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc11/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc12/config.xml b/core/res/res/values-mcc214-mnc12/config.xml
new file mode 100755
index 0000000..7468238
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc12/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc13/config.xml b/core/res/res/values-mcc214-mnc13/config.xml
new file mode 100755
index 0000000..35ff4ae
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc13/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc14/config.xml b/core/res/res/values-mcc214-mnc14/config.xml
new file mode 100755
index 0000000..b6a7440
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc14/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc15/config.xml b/core/res/res/values-mcc214-mnc15/config.xml
new file mode 100755
index 0000000..8296410
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc15/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc16/config.xml b/core/res/res/values-mcc214-mnc16/config.xml
new file mode 100755
index 0000000..1aaf577
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc16/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc17/config.xml b/core/res/res/values-mcc214-mnc17/config.xml
new file mode 100755
index 0000000..be92a32
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc17/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc18/config.xml b/core/res/res/values-mcc214-mnc18/config.xml
new file mode 100755
index 0000000..078d7e2
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc18/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc19/config.xml b/core/res/res/values-mcc214-mnc19/config.xml
new file mode 100755
index 0000000..d194687
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc19/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc20/config.xml b/core/res/res/values-mcc214-mnc20/config.xml
new file mode 100755
index 0000000..6aaf970
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc20/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21421</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc214-mnc21/config.xml b/core/res/res/values-mcc214-mnc21/config.xml
new file mode 100755
index 0000000..f890b14
--- /dev/null
+++ b/core/res/res/values-mcc214-mnc21/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc222-mnc10/config.xml b/core/res/res/values-mcc222-mnc10/config.xml
index 24dd71c..67467a0 100644
--- a/core/res/res/values-mcc222-mnc10/config.xml
+++ b/core/res/res/values-mcc222-mnc10/config.xml
@@ -35,4 +35,29 @@
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</string>
+
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>21401</item>
+ <item>21402</item>
+ <item>21403</item>
+ <item>21404</item>
+ <item>21405</item>
+ <item>21406</item>
+ <item>21407</item>
+ <item>21408</item>
+ <item>21409</item>
+ <item>21410</item>
+ <item>21411</item>
+ <item>21412</item>
+ <item>21413</item>
+ <item>21414</item>
+ <item>21415</item>
+ <item>21416</item>
+ <item>21417</item>
+ <item>21418</item>
+ <item>21419</item>
+ <item>21420</item>
+ <item>21421</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mcc234-mnc10/config.xml b/core/res/res/values-mcc234-mnc10/config.xml
new file mode 100644
index 0000000..b704d3f
--- /dev/null
+++ b/core/res/res/values-mcc234-mnc10/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>23420</item>
+ <item>23426</item>
+ <item>23430</item>
+ <item>23431</item>
+ <item>23432</item>
+ <item>23433</item>
+ <item>23434</item>
+ <item>23486</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml
index d602c9f..1ed53dc 100644
--- a/core/res/res/values-mcc234-mnc20/config.xml
+++ b/core/res/res/values-mcc234-mnc20/config.xml
@@ -24,5 +24,15 @@
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->
<integer name="config_mobile_mtu">1440</integer>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>23410</item>
+ <item>23426</item>
+ <item>23430</item>
+ <item>23431</item>
+ <item>23432</item>
+ <item>23433</item>
+ <item>23434</item>
+ <item>23486</item>
+ </string-array>
</resources>
diff --git a/core/res/res/values-mcc234-mnc26/config.xml b/core/res/res/values-mcc234-mnc26/config.xml
new file mode 100644
index 0000000..8d259de
--- /dev/null
+++ b/core/res/res/values-mcc234-mnc26/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>23410</item>
+ <item>23420</item>
+ <item>23430</item>
+ <item>23431</item>
+ <item>23432</item>
+ <item>23433</item>
+ <item>23434</item>
+ <item>23486</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc302-mnc220/config.xml b/core/res/res/values-mcc302-mnc220/config.xml
new file mode 100644
index 0000000..5259152
--- /dev/null
+++ b/core/res/res/values-mcc302-mnc220/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>302370</item>
+ <item>302610</item>
+ <item>302660</item>
+ <item>302720</item>
+ <item>302780</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc302-mnc370/config.xml b/core/res/res/values-mcc302-mnc370/config.xml
index 4fb2232..9cfe31f 100644
--- a/core/res/res/values-mcc302-mnc370/config.xml
+++ b/core/res/res/values-mcc302-mnc370/config.xml
@@ -40,4 +40,12 @@
-->
<integer name="config_mobile_mtu">1410</integer>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>302220</item>
+ <item>302610</item>
+ <item>302660</item>
+ <item>302720</item>
+ <item>302780</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mcc302-mnc660/config.xml b/core/res/res/values-mcc302-mnc660/config.xml
index 76f7968..000f897 100644
--- a/core/res/res/values-mcc302-mnc660/config.xml
+++ b/core/res/res/values-mcc302-mnc660/config.xml
@@ -40,4 +40,12 @@
-->
<integer name="config_mobile_mtu">1430</integer>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>302220</item>
+ <item>302370</item>
+ <item>302610</item>
+ <item>302720</item>
+ <item>302780</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mcc302-mnc720/config.xml b/core/res/res/values-mcc302-mnc720/config.xml
index 4eceffc..dfc58fe 100644
--- a/core/res/res/values-mcc302-mnc720/config.xml
+++ b/core/res/res/values-mcc302-mnc720/config.xml
@@ -40,4 +40,12 @@
-->
<integer name="config_mobile_mtu">1430</integer>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>302220</item>
+ <item>302370</item>
+ <item>302610</item>
+ <item>302660</item>
+ <item>302780</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mcc310-mnc150/config.xml b/core/res/res/values-mcc310-mnc150/config.xml
new file mode 100644
index 0000000..f1936f4
--- /dev/null
+++ b/core/res/res/values-mcc310-mnc150/config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Show roaming icon though same named operators. -->
+ <string-array translatable="false" name="config_sameNamedOperatorConsideredRoaming">
+ <item>310110</item>
+ <item>310140</item>
+ <item>310400</item>
+ <item>310470</item>
+ </string-array>
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>311</item>
+ <item>312</item>
+ <item>313</item>
+ <item>314</item>
+ <item>315</item>
+ <item>316</item>
+ </string-array>
+</resources>
diff --git a/core/res/res/values-mcc310-mnc170 b/core/res/res/values-mcc310-mnc170
new file mode 120000
index 0000000..cfced17
--- /dev/null
+++ b/core/res/res/values-mcc310-mnc170
@@ -0,0 +1 @@
+./values-mcc310-mnc150
\ No newline at end of file
diff --git a/core/res/res/values-mcc310-mnc380 b/core/res/res/values-mcc310-mnc380
new file mode 120000
index 0000000..cfced17
--- /dev/null
+++ b/core/res/res/values-mcc310-mnc380
@@ -0,0 +1 @@
+./values-mcc310-mnc150
\ No newline at end of file
diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml
index 73aa1ce..c7ae8c8 100644
--- a/core/res/res/values-mcc310-mnc410/config.xml
+++ b/core/res/res/values-mcc310-mnc410/config.xml
@@ -24,5 +24,20 @@
<!-- Configure mobile network MTU. Carrier specific value is set here.
-->
<integer name="config_mobile_mtu">1410</integer>
-
+ <!-- Show roaming icon though same named operators. -->
+ <string-array translatable="false" name="config_sameNamedOperatorConsideredRoaming">
+ <item>310110</item>
+ <item>310140</item>
+ <item>310400</item>
+ <item>310470</item>
+ </string-array>
+ <!-- BEGIN Motorola, xnk746, Feb-12-2014, IKVPREL2KK-1468 -->
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>311</item>
+ <item>312</item>
+ <item>313</item>
+ <item>314</item>
+ <item>315</item>
+ <item>316</item>
+ </string-array>
</resources>
diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml
index e3d8420..1c83644 100644
--- a/core/res/res/values-mcc311-mnc480/config.xml
+++ b/core/res/res/values-mcc311-mnc480/config.xml
@@ -38,4 +38,9 @@
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
<bool name="imsServiceAllowTurnOff">false</bool>
+ <!-- Flag specifying whether VoLTE & VT should be allowed on device: independent of the
+ carrier provisioning. If false: hard disabled. If true: then depends on carrier
+ provisioning, availability etc -->
+ <bool name="config_mobile_allow_volte_vt">false</bool>
+
</resources>
diff --git a/core/res/res/values-mcc340-mnc01/config.xml b/core/res/res/values-mcc340-mnc01/config.xml
index bbab4ad..bb491ed 100644
--- a/core/res/res/values-mcc340-mnc01/config.xml
+++ b/core/res/res/values-mcc340-mnc01/config.xml
@@ -35,4 +35,10 @@
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string translatable="false" name="config_tether_apndata">Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN</string>
+
+ <string-array translatable="false" name="config_operatorConsideredNonRoaming">
+ <item>20801</item>
+ <item>20815</item>
+ </string-array>
+
</resources>
diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml
index 3d029c6..c53226a 100644
--- a/core/res/res/values-mk-rMK/strings.xml
+++ b/core/res/res/values-mk-rMK/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Овозможува апликацијата да пристапува до надворешна меморија за сите корисници."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"пристапи кон кеш на систем на датотеки"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Дозволува апликацијата да чита и да пишува кеш систем на датотеки."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"остварувај/примај повици преку СИП"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Дозволува апликацијата да остварува и прима повици преку СИП."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"комуницирај со екран на дојдовен повик"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Овозможува апликацијата да контролира кога и како корисникот го гледа екранот на дојдовен повик."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"читај употреба на мрежа во минатото"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Дозволува апликацијата да го чита историското користење на мрежата за одредени мрежи или апликации."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"управувај со политика на мрежа"</string>
@@ -1766,530 +1768,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Избрано <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Избришано <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Работа <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Вие сте во режим на заклучување на апликација. За да излезете, допрете го и задржете го копчето Неодамнешни"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Се наоѓате во режимот заклучување апликација."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Да се користи заклучување апликација?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Заклучувањето апликација го заклучува екранот на една апликација.\n\nЗа да излезете, допрете го и задржете го копчето Неодамнешни."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"НЕ, БЛАГОДАРАМ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"СТАРТ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Заклучен на апликација"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Не е повеќе заклучен на апликација"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Пред излегување побарајте %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"ПИН"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"шема за отклучување"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"лозинка"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"ТВ-насоки за родители"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Сугестивен дијалог (обично значи разговори за секс)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Непристоен говор"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Сексуална содржина"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Насилство"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Фантазија со насилство (само детски програми)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml
index c7f9828..733a508 100644
--- a/core/res/res/values-ml-rIN/strings.xml
+++ b/core/res/res/values-ml-rIN/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"എല്ലാ ഉപയോക്താക്കൾക്കായും ബാഹ്യ സംഭരണം ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"കാഷെ ഫയൽ സിസ്റ്റം ആക്സസ്സ് ചെയ്യുക"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"കാഷെ ഫയൽ സിസ്റ്റം റീഡുചെയ്യുന്നതിനും റൈറ്റുചെയ്യുന്നതിനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP കോളുകൾ വിളിക്കുക/സ്വീകരിക്കുക"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP കോളുകൾ വിളിക്കാനും സ്വീകരിക്കാനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ഇൻ-കോൾ സ്ക്രീനുമായി സംവദിക്കുക"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ഉപയോക്താവ് ഇൻ-കോൾ സ്ക്രീൻ എപ്പോൾ, എങ്ങനെ കാണുന്നുവെന്നത് നിയന്ത്രിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ചരിത്രപരമായ നെറ്റ്വർക്ക് ഉപയോഗം വായിക്കുക"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"നിർദ്ദിഷ്ട നെറ്റ്വർക്കുകൾക്കും അപ്ലിക്കേഷനുകൾക്കുമുള്ള ചരിത്രപരമായ നെറ്റ്വർക്ക് ഉപയോഗം റീഡുചെയ്യുന്നതിന് അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"നെറ്റ്വർക്ക് നയം നിയന്ത്രിക്കുക"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> തിരഞ്ഞെടുത്തു"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ഇല്ലാതാക്കി"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"ഔദ്യോഗികം <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"നിങ്ങൾ \'അപ്ലിക്കേഷനിലേക്ക് ലോക്കുചെയ്യൽ\' എന്ന മോഡിലാണ്. പുറത്തുകടക്കുന്നതിന് അടുത്തിടെയുള്ളത് എന്ന ബട്ടൺ സ്പർശിച്ച് പിടിക്കുക"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"നിങ്ങൾ \'ലോക്ക്-ടു-അപ്ലിക്കേഷൻ\' മോഡിലാണ്."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ലോക്ക്-ടു-അപ്ലിക്കേഷൻ ഉപയോഗിക്കണോ?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"\'അപ്ലിക്കേഷനിലേക്ക് ലോക്കുചെയ്യൽ\' ഒരു അപ്ലിക്കേഷനിലെ ഡിസ്പ്ലേയെ ലോക്കുചെയ്യുന്നു.\n\nപുറത്തുകടക്കുന്നതിന്, അടുത്തിടെയുള്ളത് എന്ന ബട്ടൺ സ്പർശിച്ച് പിടിക്കുക."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"വേണ്ട, നന്ദി"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ആരംഭിക്കുക"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"അപ്ലിക്കേഷനിലേക്ക് ലോക്കുചെയ്തു"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"അപ്ലിക്കേഷനിലേക്ക് ഇനി ലോക്കുചെയ്യില്ല"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"പുറത്തുകടക്കുന്നതിന് മുമ്പ് %1$s ആവശ്യപ്പെടുക"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"പിൻ"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"അൺലോക്ക് പാറ്റേൺ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"പാസ്വേഡ്"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"ടിവി രക്ഷാകർതൃ മാർഗ്ഗനിർദ്ദേശങ്ങൾ"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ലൈംഗിക സൂചക സംഭാഷണം (ലൈംഗികതയെക്കുറിച്ച് സംസാരിക്കുന്നത് എന്ന അർത്ഥമുള്ളത്)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"മോശമായ ഭാഷ"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"ലൈംഗിക ഉള്ളടക്കം"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"അക്രമം"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ഫാന്റസി അക്രമം (കുട്ടികളുടെ പ്രോഗ്രാമിംഗ് മാത്രം)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml
index 7e76011..0e90ada 100644
--- a/core/res/res/values-mn-rMN/strings.xml
+++ b/core/res/res/values-mn-rMN/strings.xml
@@ -716,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Апп-д SIP дуудлага хийх болон хүлээн авахыг зөвшөөрөх."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"дуудлагын дэлгэцтэй харьцах"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Апп-д дуудлагын дэлгэцийг хэрэглэгчид хэзээ хэрхэн харуулахыг удирдахыг зөвшөөрнө."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"сүлжээний ашиглалтын түүхийг унших"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Апп нь тусгай сүлжээ болон апп-н сүлжээ ашиглалтын түүхийг унших боломжтой."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"сүлжээний бодлогыг удирдах"</string>
@@ -1760,530 +1764,30 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> сонгогдсон"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> устсан"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Ажлын <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Та Апп-дотор-түгжих горимд байна. Гарахын тулд Саяхны товчинд хүрч дарна уу"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Та Апп-дотор-түгжих горимд байна."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Апп-дотор-түгжих-г ашиглах уу?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Апп-дотор-түгжих нь дэлгэцийг нэг апп дотор түгжинэ.\n\nГарахын тулд Саяхны товчинд хүрч, дарна."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ҮГҮЙ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ЭХЛҮҮЛЭХ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Апп дотор түгжигдсэн"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Апп дотор түгжихийг зогсоосон"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Гарахын өмнө %1$s-г асуух"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"тайлах хээ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"нууц үг"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Эцэг эхэд зориулсан ТВ-ийн заавар"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Сэдэл үүсгэх диалоги (Ихэвчлэн сексийн тухай яриаг илэрхийлнэ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Бүдүүлэг яриа"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Секс контент"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Хүчирхийлэл"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Фантаз хүчирхийлэл (Зөвхөн хүүхдийн нэвтрүүлэгт)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
- <!-- no translation found for battery_saver_description (725676363406667978) -->
+ <string name="battery_saver_description" msgid="725676363406667978">"Батерейны ашиглалтыг уртасгахын тулд батерей хэмнэгч нь таны төхөөрөмжийн ажиллагааг бууруулж, чичрэлт болон далд датаны ихэнх хувийг хязгаарлана. Имэйл, зурвас гэх мэт синк хийгддэг бусад апп-ууд таныг нээхээс нааш шинэчлэгдэхгүй байж болно.\n\nТаныг төхөөрөмжөө цэнэглэх үед батерей хэмнэгч автоматаар унтарна."</string>
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
<skip />
</resources>
diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml
index 8546a4e..cde4dd1 100644
--- a/core/res/res/values-mr-rIN/strings.xml
+++ b/core/res/res/values-mr-rIN/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"सर्व वापरकर्त्यांच्या बाह्य संचयनावर प्रवेश करण्यासाठी अॅप ला अनुमती देते."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"कॅशे फाईलसिस्टम वर प्रवेश करा"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"कॅशे filesystem वाचण्यासाठी आणि लिहिण्यासाठी अॅप ला अनुमती देते."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP कॉल करा/प्राप्त करा"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"अॅपला SIP कॉल करण्याची आणि प्राप्त करण्याची अनुमती देते."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"कॉल-मध्ये स्क्रीनशी परस्परसंवाद करा"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"कॉल-मधील स्क्रीन वापरकर्ता केव्हा आणि कशी पाहतो अॅपला ते नियंत्रित करण्याची अनुमती देते."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ऐतिहासिक नेटवर्क वापर वाचा"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"विशिष्ट नेटवर्क आणि अॅप्सकरिता ऐतिहासिक नेटवर्क वापराचे वाचन करण्यासाठी अॅप ला अनुमती देते."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"नेटवर्क धोरण व्यवस्थापित करा"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> निवडले"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> हटविली"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्य <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"आपण अॅप-लॉक-करणे मोड मध्ये आहात. बाहेर पडण्यासाठी, अलीकडील बटणास स्पर्श करा आणि धरून ठेवा."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"आपण अॅप-लॉक-करणे मोडमध्ये आहात."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"अॅप-लॉक-करणे वापरायचे?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"अॅप-लॉक-करणे एकल अॅप मधील प्रदर्शन लॉक करते.\n\nबाहेर पडण्यासाठी, अलीकडील बटणास स्पर्श करा आणि धरून ठेवा."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"नाही, धन्यवाद"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"प्रारंभ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"अॅप वर लॉक केले"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"अॅप वर यापुढे लॉक केलेले असणार नाही"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"बाहेर पडण्यापूर्वी %1$s साठी विचारा"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"अनलॉक नमुना"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"संकेतशब्द"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"टीव्ही पालकांसाठी मार्गदर्शक तत्त्वे"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"अश्लील संवाद (सामान्यतः याचा अर्थ लैंगिकतेविषयी चर्चा असा होतो)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"असभ्य भाषा"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"लैंगिक सामग्री"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"हिंसा"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"काल्पनिक हिंसा (केवळ मुलांचे प्रोग्रामिंग)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml
index 43e0299..0bf4ca6 100644
--- a/core/res/res/values-ms-rMY/strings.xml
+++ b/core/res/res/values-ms-rMY/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"ID Pemanggil Masuk"</string>
<string name="ClirMmi" msgid="7784673673446833091">"ID Pemanggil Keluar"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"ID Laluan yang disambungkan"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Sekatan ID Laluan yang disambungkan"</string>
<string name="CfMmi" msgid="5123218989141573515">"Pemajuan panggilan"</string>
<string name="CwMmi" msgid="9129678056795016867">"Panggilan menunggu"</string>
<string name="BaMmi" msgid="455193067926770581">"Sekatan panggilan"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Membenarkan apl untuk mengakses storan luaran untuk semua pengguna."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"akses sistem fail cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Membenarkan apl membaca dan menulis cache sistem fail."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"buat/terima panggilan SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Membenarkan apl membuat dan menerima panggilan SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"berinteraksi dengan skrin dalam panggilan"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Membenarkan apl mengawal masa dan cara pengguna melihat skrin dalam panggilan."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"baca sejarah penggunaan rangkaian"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Membenarkan apl membaca sejarah penggunaan rangkaian untuk rangkaian dan apl khusus."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"urus dasar rangkaian"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"Kad SIM tiada atau tidak boleh dibaca. Sila masukkan kad SIM."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Kad SIM tidak boleh digunakan."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Kad SIM anda telah dilumpuhkan secara kekal.\n Hubungi pembekal perkhidmatan wayarles anda untuk mendapatkan kad SIM lain."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Lagu sebelumnya"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Lagu seterusnya"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Jeda"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Main"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Berhenti"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Gulung semula"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Mara laju"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Panggilan kecemasan sahaja"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Rangkaian dikunci"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Kad SIM dikunci dengan PUK."</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Kurangkan jam"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Tetapkan PM"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Tetapkan AM"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"PTG"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"PG"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"Tingkatkan bulan"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Kurangkan bulan"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"Tingkatkan hari"</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> dipilih"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> dipadamkan"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Kerja <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Anda berada dalam mod kunci ke apl. Untuk keluar, sentuh dan tahan butang Terbaru"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Anda berada dalam mod Kunci ke Apl."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Gunakan kunci ke apl?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Kunci dalam apl mengunci paparan dalam apl tunggal.\n\nUntuk keluar, sentuh dan tahan butang Terbaru."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"TIDAK, TERIMA KASIH"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"MULA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Dikunci ke apl"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Tidak lagi dikunci ke apl"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Minta %1$s sebelum keluar"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"corak buka kunci"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"kata laluan"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Garis Panduan TV Ibu Bapa"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialog tidak senonoh (Biasanya bermaksud perbualan mengenai seks)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Bahasa kasar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Kandungan seksual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Keganasan"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Keganasan fantasi (rancangan kanak-kanak sahaja)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml
index b0efad9..8fdeedb 100644
--- a/core/res/res/values-my-rMM/strings.xml
+++ b/core/res/res/values-my-rMM/strings.xml
@@ -34,10 +34,10 @@
<string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> နာရီ <xliff:g id="MINUTES">%2$d</xliff:g> မိနစ်"</string>
<string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> နာရီ <xliff:g id="MINUTES">%2$d</xliff:g> မိနစ်"</string>
<string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ်"</string>
- <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string>
- <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string>
- <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> စက္ကန့်"</string>
- <string name="durationSecond" msgid="985669622276420331">"<xliff:g id="SECONDS">%1$d</xliff:g> စက္ကန့်"</string>
+ <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string>
+ <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string>
+ <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> စက္ကန့်"</string>
+ <string name="durationSecond" msgid="985669622276420331">"<xliff:g id="SECONDS">%1$d</xliff:g> စက္ကန့်"</string>
<string name="untitled" msgid="4638956954852782576">"<ခေါင်းစဉ်မဲ့>"</string>
<string name="ellipsis" msgid="7899829516048813237">"…"</string>
<string name="ellipsis_two_dots" msgid="1228078994866030736">"‥"</string>
@@ -46,7 +46,7 @@
<string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"အသံစာပို့စနစ်"</string>
<string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>
<string name="mmiError" msgid="5154499457739052907">"ဆက်သွယ်မှုဆိုင်ရာပြသနာ သို့မဟုတ် မမှန်ကန်သောMMIကုတ်"</string>
- <string name="mmiFdnError" msgid="5224398216385316471">"သတ်မှတ်ခေါ်ဆိုနိုင်သောနံပါတ်များထံသာ ကန့်သတ်ထားသည်"</string>
+ <string name="mmiFdnError" msgid="5224398216385316471">"သတ်မှတ်ခေါ်ဆိုနိုင်သောနံပါတ်များထံသာ ကန့်သတ်ထားသည်"</string>
<string name="serviceEnabled" msgid="8147278346414714315">"ဝန်ဆောင်မှု လုပ်ဆောင်နိုင်မည်"</string>
<string name="serviceEnabledFor" msgid="6856228140453471041">"ဝန်ဆောင်မှု ရရှိမည်"</string>
<string name="serviceDisabled" msgid="1937553226592516411">"ဝန်ဆောင်မှုအား ရပ်ဆိုင်းသည်"</string>
@@ -56,10 +56,10 @@
<string name="mmiComplete" msgid="8232527495411698359">"MMI ပြီးဆုံးပါပြီ"</string>
<string name="badPin" msgid="9015277645546710014">"သင် ရိုက်ထည့်သော PIN ဟောင်းမှာ မမှန်ပါ။"</string>
<string name="badPuk" msgid="5487257647081132201">"သင်ရိုက် ထည့်သော PUK မှာ မမှန်ကန်ပါ။"</string>
- <string name="mismatchPin" msgid="609379054496863419">"သင် ရိုက်ထည့်ခဲ့သည့် PIN များ မတိုက်ဆိုင်ပါ။"</string>
- <string name="invalidPin" msgid="3850018445187475377">"နံပါတ်(၄)ခုမှ(၈)ခုအထိပါရှိသော ပင်နံပါတ်အားထည့်ပါ"</string>
- <string name="invalidPuk" msgid="8761456210898036513">"နံပါတ်(၈)ခုသို့မဟုတ် ထိုထက်ရှည်သောသော PUKအားထည့်သွင်းပါ"</string>
- <string name="needPuk" msgid="919668385956251611">"ဆင်းမ်ကဒ် ရဲ့ ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် သော့ကျနေပါသည်။ ဖွင့်ရန် ကုဒ်အားထည့်သွင်းပါ။"</string>
+ <string name="mismatchPin" msgid="609379054496863419">"သင် ရိုက်ထည့်ခဲ့သည့် PIN များ မတိုက်ဆိုင်ပါ။"</string>
+ <string name="invalidPin" msgid="3850018445187475377">"နံပါတ်(၄)ခုမှ(၈)ခုအထိပါရှိသော ပင်နံပါတ်အားထည့်ပါ"</string>
+ <string name="invalidPuk" msgid="8761456210898036513">"နံပါတ်(၈)ခုသို့မဟုတ် ထိုထက်ရှည်သောသော PUKအားထည့်သွင်းပါ"</string>
+ <string name="needPuk" msgid="919668385956251611">"ဆင်းမ်ကဒ် ရဲ့ ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် သော့ကျနေပါသည်။ ဖွင့်ရန် ကုဒ်အားထည့်သွင်းပါ။"</string>
<string name="needPuk2" msgid="4526033371987193070">"ဆင်းမ်ကဒ်အားမပိတ်ရန် PUK2အားထည့်သွင်းပါ"</string>
<string name="enablePin" msgid="209412020907207950">"မအောင်မြင်ပါ, SIM/RUIM သော့ကို အရင် သုံးခွင့်ပြုရန်"</string>
<plurals name="pinpuk_attempts">
@@ -72,24 +72,24 @@
<string name="ClirMmi" msgid="7784673673446833091">"အထွက်ခေါ်ဆိုခြင်းအိုင်ဒီ"</string>
<string name="ColpMmi" msgid="3065121483740183974">"လိုင်း ID ချိတ်ဆက်သည်"</string>
<string name="ColrMmi" msgid="4996540314421889589">"လိုင်း ID ချိတ်ဆက်မှု ကန့်သတ်ချက်များ"</string>
- <string name="CfMmi" msgid="5123218989141573515">"အဝင်ခေါ်ဆိုမှုအား ထပ်ဆင့်ပို့ခြင်း"</string>
- <string name="CwMmi" msgid="9129678056795016867">"ခေါ်ဆိုမှု စောင့်ဆိုင်းခြင်း"</string>
+ <string name="CfMmi" msgid="5123218989141573515">"အဝင်ခေါ်ဆိုမှုအား ထပ်ဆင့်ပို့ခြင်း"</string>
+ <string name="CwMmi" msgid="9129678056795016867">"ခေါ်ဆိုမှု စောင့်ဆိုင်းခြင်း"</string>
<string name="BaMmi" msgid="455193067926770581">"အဝင်ခေါ်ဆိုမှုအားတားဆီးခြင်း"</string>
<string name="PwdMmi" msgid="7043715687905254199">"လျှို့ဝှက်နံပါတ်/စာ ပြောင်းသည်"</string>
<string name="PinMmi" msgid="3113117780361190304">"ပင်နံပါတ်ပြောင်းသည်"</string>
<string name="CnipMmi" msgid="3110534680557857162">"ခေါ်ဆိုသောနံပါတ်တည်ရှိသည်"</string>
- <string name="CnirMmi" msgid="3062102121430548731">"ခေါ်ဆိုသောနံပါတ်အားကန့်သတ်ခြင်း"</string>
+ <string name="CnirMmi" msgid="3062102121430548731">"ခေါ်ဆိုသောနံပါတ်အားကန့်သတ်ခြင်း"</string>
<string name="ThreeWCMmi" msgid="9051047170321190368">"(၃)ယောက်ဆိုင်ပြောဆိုခြင်း"</string>
- <string name="RuacMmi" msgid="7827887459138308886">"စိတ်အနှောက်အယှက်ဖြစ်သော မလိုလားသည့်ခေါ်ဆိုမှုများအား ငြင်းဖယ်ခြင်း"</string>
+ <string name="RuacMmi" msgid="7827887459138308886">"စိတ်အနှောက်အယှက်ဖြစ်သော မလိုလားသည့်ခေါ်ဆိုမှုများအား ငြင်းဖယ်ခြင်း"</string>
<string name="CndMmi" msgid="3116446237081575808">"ခေါ်ဆိုသောနံပါတ် ပေးပို့မှု"</string>
- <string name="DndMmi" msgid="1265478932418334331">"မနှောက်ယှက်ပါနှင့်"</string>
- <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string>
- <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string>
- <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string>
- <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string>
- <string name="serviceNotProvisioned" msgid="8614830180508686666">"ဝန်ဆောင်မှုအား ကန့်သတ်မထားပါ"</string>
+ <string name="DndMmi" msgid="1265478932418334331">"မနှောက်ယှက်ပါနှင့်"</string>
+ <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string>
+ <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string>
+ <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string>
+ <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string>
+ <string name="serviceNotProvisioned" msgid="8614830180508686666">"ဝန်ဆောင်မှုအား ကန့်သတ်မထားပါ"</string>
<string name="CLIRPermanent" msgid="3377371145926835671">"သင်သည် ခေါ်ဆိုသူ ID ဆက်တင်ကို မပြောင်းလဲနိုင်ပါ။"</string>
- <string name="RestrictedChangedTitle" msgid="5592189398956187498">"ဝင်ရောက်ကြည့်ရှုခြင်းကန့်သတ်ချက်အားပြောင်းထားသည်"</string>
+ <string name="RestrictedChangedTitle" msgid="5592189398956187498">"ဝင်ရောက်ကြည့်ရှုခြင်းကန့်သတ်ချက်အားပြောင်းထားသည်"</string>
<string name="RestrictedOnData" msgid="8653794784690065540">"ဒေတာဝန်ဆောင်မှုပိတ်ထားသည်။"</string>
<string name="RestrictedOnEmergency" msgid="6581163779072833665">"အရေးပေါ်ဝန်ဆောင်မှုပိတ်ထားသည်။"</string>
<string name="RestrictedOnNormal" msgid="4953867011389750673">"အသံဝန်ဆောင်မှုပိတ်ထားသည်။"</string>
@@ -106,25 +106,25 @@
<string name="serviceClassDataSync" msgid="7530000519646054776">"ထပ်တူ ကိုက်ညီခြင်း"</string>
<string name="serviceClassPacket" msgid="6991006557993423453">"Packet"</string>
<string name="serviceClassPAD" msgid="3235259085648271037">"PAD"</string>
- <string name="roamingText0" msgid="7170335472198694945">"ရုန်းမင်းအချက်ပြမီး ဖွင့်ထားခြင်း"</string>
+ <string name="roamingText0" msgid="7170335472198694945">"ရုန်းမင်းအချက်ပြမီး ဖွင့်ထားခြင်း"</string>
<string name="roamingText1" msgid="5314861519752538922">"ရုန်းမင်းအချက်ပြမီး ပိတ်ထားခြင်း"</string>
<string name="roamingText2" msgid="8969929049081268115">"ရုန်းမင်းအချက်ပြမီး လက်နေခြင်း"</string>
<string name="roamingText3" msgid="5148255027043943317">"ပတ်ဝန်းကျင်အနီးအနားပြင်ပ"</string>
<string name="roamingText4" msgid="8808456682550796530">"အဆောက်အဦးပြင်ပ"</string>
- <string name="roamingText5" msgid="7604063252850354350">"ရုန်းမင်း-ပိုမိုသင့်တော်သောစနစ်"</string>
+ <string name="roamingText5" msgid="7604063252850354350">"ရုန်းမင်း-ပိုမိုသင့်တော်သောစနစ်"</string>
<string name="roamingText6" msgid="2059440825782871513">"ရုန်းမင်း-ရရှိနိုင်သောစနစ်"</string>
<string name="roamingText7" msgid="7112078724097233605">"ရုန်းမင်း-ပူးပေါင်းလုပ်ဖော်ကိုင်ဖက်"</string>
<string name="roamingText8" msgid="5989569778604089291">"ရုန်းမင်း-အထူးတန်ဖိုးထားရသောလုပ်ဖော်ကိုင်ဖက်"</string>
- <string name="roamingText9" msgid="7969296811355152491">"ရုန်းမင်း-ဝန်ဆောင်မှုအပြည့်လုပ်ဆောင်မှု"</string>
+ <string name="roamingText9" msgid="7969296811355152491">"ရုန်းမင်း-ဝန်ဆောင်မှုအပြည့်လုပ်ဆောင်မှု"</string>
<string name="roamingText10" msgid="3992906999815316417">"ရုန်းမင်း-ဝန်ဆောင်မှုတစိတ်တပိုင်းလုပ်ဆောင်မှု"</string>
- <string name="roamingText11" msgid="4154476854426920970">"ရုန်းမင်းစာတမ်းဖွင့်ရန်"</string>
+ <string name="roamingText11" msgid="4154476854426920970">"ရုန်းမင်းစာတမ်းဖွင့်ရန်"</string>
<string name="roamingText12" msgid="1189071119992726320">"ရုန်းမင်းစာတမ်းပိတ်ထားရန်"</string>
<string name="roamingTextSearching" msgid="8360141885972279963">"ဆားဗစ်အားရှာဖွေနေသည်"</string>
- <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
+ <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
<string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
- <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> နောက် <xliff:g id="TIME_DELAY">{2}</xliff:g> စက္ကန့်"</string>
- <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
- <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
+ <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> နောက် <xliff:g id="TIME_DELAY">{2}</xliff:g> စက္ကန့်"</string>
+ <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
+ <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
<string name="fcComplete" msgid="3118848230966886575">"ပုံစံကုတ်ပြီးဆုံးသည်"</string>
<string name="fcError" msgid="3327560126588500777">"ဆက်သွယ်မှုဆိုင်ရာပြသနာ သို့မဟုတ် တရားမဝင်သောပုံစံကုတ်"</string>
<string name="httpErrorOk" msgid="1191919378083472204">"ကောင်းပြီ"</string>
@@ -132,11 +132,11 @@
<string name="httpErrorLookup" msgid="4711687456111963163">"URL ကို ရှာဖွေ့ မတွေ့ရှိပါ"</string>
<string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"ဆိုက် မှန်ကန်မှု စိစစ်ရေး စနစ်ကို ပံ့ပိုး မပေးပါ။"</string>
<string name="httpErrorAuth" msgid="1435065629438044534">"စစ်ဆေးမှု မအောင်မြင်ပါ"</string>
- <string name="httpErrorProxyAuth" msgid="1788207010559081331">"ပရိုစီဆာဗာမှတဆင့် အထောက်အထားပြခြင်းမအောင်မြင်ပါ"</string>
+ <string name="httpErrorProxyAuth" msgid="1788207010559081331">"ပရိုစီဆာဗာမှတဆင့် အထောက်အထားပြခြင်းမအောင်မြင်ပါ"</string>
<string name="httpErrorConnect" msgid="8714273236364640549">"ဆာဗာကို ဆက်သွယ်လို့ မရပါ"</string>
<string name="httpErrorIO" msgid="2340558197489302188">"ဆာဗာနဲ့ ဆက်သွယ်လို့ မရပါ။ နောက်မှ ပြန်လည်ကြိုးစားပါ"</string>
<string name="httpErrorTimeout" msgid="4743403703762883954">"ဆာဗာအားဆက်သွယ်မှု အချိန်ကုန်ဆုံးသွားပါသည်"</string>
- <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"ဤစာမျက်နှာတွင် ဆာဗာအားတဆင့်လွှဲမှု များစွာပါဝင်သည်"</string>
+ <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"ဤစာမျက်နှာတွင် ဆာဗာအားတဆင့်လွှဲမှု များစွာပါဝင်သည်"</string>
<string name="httpErrorUnsupportedScheme" msgid="5015730812906192208">"ပရိုတိုကောကို ပံ့ပိုး မပေးပါ။"</string>
<string name="httpErrorFailedSslHandshake" msgid="96549606000658641">"လုံခြုံစိတ်ချရသော ဆက်သွယ်မှု မရပါ"</string>
<string name="httpErrorBadUrl" msgid="3636929722728881972">"URL က အမှန်အကန် မဟုတ်သောကြောင့် စာမျက်နှာကို ဖွင့် လို့ မရပါ"</string>
@@ -148,7 +148,7 @@
<string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"ထပ်တူ ကိုက်ညီခြင်း"</string>
<string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"ဖျက်ရန် <xliff:g id="CONTENT_TYPE">%s</xliff:g> များစွာရှိ"</string>
<string name="low_memory" product="tablet" msgid="6494019234102154896">"တက်ဘလက်တွင် သိမ်းဆည်းသော နေရာ ကုန်သွားပါပြီ။ တချို့ ဖိုင်များ ဖျက်စီးခြင်းဖြင့် နေရာလွတ် ပြုလုပ်ပါ"</string>
- <string name="low_memory" product="watch" msgid="4415914910770005166">"သိုလှောင်ခန်း နေရာ ပြည့်နေပြီ။ နေရာ လွတ်လာရန် ဖိုင် အချို့ကို ဖျက်ပါ။"</string>
+ <string name="low_memory" product="watch" msgid="4415914910770005166">"သိုလှောင်ခန်း နေရာ ပြည့်နေပြီ။ နေရာ လွတ်လာရန် ဖိုင် အချို့ကို ဖျက်ပါ။"</string>
<string name="low_memory" product="default" msgid="3475999286680000541">"ဖုန်းတွင် သိမ်းဆည်းသော နေရာ ကုန်သွားပါပြီ။ တချို့ ဖိုင်များ ဖျက်စီးခြင်းဖြင့် နေရာလွတ် ပြုလုပ်ပါ"</string>
<string name="ssl_ca_cert_warning" msgid="5848402127455021714">"ကွန်ရက်ကို စောင့်ကြည့်စစ်ဆေးခံရနိုင်သည်"</string>
<string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"အမျိုးအမည်မသိ တတိယ ပါတီဖြင့်"</string>
@@ -157,7 +157,7 @@
<string name="power_dialog" product="tablet" msgid="8545351420865202853">"Tabletဆိုင်ရာရွေးချယ်မှုများ"</string>
<string name="power_dialog" product="default" msgid="1319919075463988638">"ဖုန်းဆိုင်ရာရွေးချယ်မှုများ"</string>
<string name="silent_mode" msgid="7167703389802618663">"အသံတိတ်စနစ်"</string>
- <string name="turn_on_radio" msgid="3912793092339962371">"wirelessအားဖွင့်မည်"</string>
+ <string name="turn_on_radio" msgid="3912793092339962371">"wirelessအားဖွင့်မည်"</string>
<string name="turn_off_radio" msgid="8198784949987062346">"wirelessအားပိတ်မည်"</string>
<string name="screen_lock" msgid="799094655496098153">"ဖုန်းမျက်နှာပြင်အား သော့ချရန်"</string>
<string name="power_off" msgid="4266614107412865048">"ပိတ်ရန်"</string>
@@ -165,9 +165,9 @@
<string name="silent_mode_vibrate" msgid="7072043388581551395">"တုန်ခါခြင်း ဖုန်းမြည်သံ"</string>
<string name="silent_mode_ring" msgid="8592241816194074353">"ဖုန်းမြည်သံဖွင့်ထားသည်"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"စက်ပိတ်ပါမည်"</string>
- <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"သင့်တက်ပလက်အား စက်ပိတ်ပါမည်"</string>
- <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"သင်၏ ကြည့်ရှုမှု ပိတ်ပစ်မည်။"</string>
- <string name="shutdown_confirm" product="default" msgid="649792175242821353">"သင့်ဖုန်းအား စက်ပိတ်ပါမည်"</string>
+ <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"သင့်တက်ပလက်အား စက်ပိတ်ပါမည်"</string>
+ <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"သင်၏ ကြည့်ရှုမှု ပိတ်ပစ်မည်။"</string>
+ <string name="shutdown_confirm" product="default" msgid="649792175242821353">"သင့်ဖုန်းအား စက်ပိတ်ပါမည်"</string>
<string name="shutdown_confirm_question" msgid="2906544768881136183">"သင်က ပိတ်ပစ်မှာကို လိုပါသလား?"</string>
<string name="reboot_safemode_title" msgid="7054509914500140361">"safe mode ဖြင့် ပြန်လည် စ တင်ရန်"</string>
<string name="reboot_safemode_confirm" msgid="55293944502784668">"safe mode ကို ပြန်လည် စတင် မလား? ဒီလို စတင်ခြင်းဟာ သင် သွင်းထားသော တတိယပါတီ အပလီကေးရှင်းများအား ရပ်ဆိုင်းထားပါမည်။ ပုံမှန်အတိုင်း ပြန်စလျှင် ထိုအရာများ ပြန်လည် ရောက်ရှိလာပါမည်။"</string>
@@ -182,9 +182,9 @@
<string name="bugreport_message" msgid="398447048750350456">"သင့်ရဲ့ လက်ရှိ စက်အခြေအနေ အချက်အလက်များကို အီးမေးလ် အနေဖြင့် ပေးပို့ရန် စုဆောင်းပါမည်။ အမှားရှာဖွေပြင်ဆင်မှုမှတ်တမ်းမှ ပေးပို့ရန် အသင့်ဖြစ်သည်အထိ အချိန် အနည်းငယ်ကြာမြင့်မှာ ဖြစ်သဖြင့် သည်းခံပြီး စောင့်ပါရန်"</string>
<string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"အသံတိတ်စနစ်"</string>
<string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"အသံပိတ်ထားသည်"</string>
- <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"အသံဖွင့်ထားသည်"</string>
+ <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"အသံဖွင့်ထားသည်"</string>
<string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်"</string>
- <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"လေယဥ်ပျံပေါ်၌အသုံးပြုသောစနစ်ဖွင့်ထားသည်"</string>
+ <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"လေယဥ်ပျံပေါ်၌အသုံးပြုသောစနစ်ဖွင့်ထားသည်"</string>
<string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"လေယဥ်ပျံပေါ်၌အသုံးပြုသောစနစ်ပိတ်ထားသည်"</string>
<string name="global_action_settings" msgid="1756531602592545966">"ဆက်တင်များ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ယခု သော့ပိတ်ရန်"</string>
@@ -195,13 +195,13 @@
<string name="managed_profile_label" msgid="6260850669674791528">"အလုပ်"</string>
<string name="permgrouplab_costMoney" msgid="5429808217861460401">"သင်ငွေကုန်ကျမည်ဖြစ်သောဝန်ဆောင်မှုများ"</string>
<string name="permgroupdesc_costMoney" msgid="3293301903409869495">"သင်ပိုက်ဆံကုန်ကျစေသော အရာများ ပြုလုပ်ခြင်း"</string>
- <string name="permgrouplab_messages" msgid="7521249148445456662">"သင့်စာများ"</string>
- <string name="permgroupdesc_messages" msgid="7821999071003699236">"Read and write သင်၏ စာတို၊ အီးမေးလ်၊ နှင့် အခြား စာများကို ဖတ်ခြင်း နှင့် ရေးခြင်း။"</string>
- <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"သင့်ကိုယ်ပိုင်ရေးရာအချက်အလက်များ"</string>
+ <string name="permgrouplab_messages" msgid="7521249148445456662">"သင့်စာများ"</string>
+ <string name="permgroupdesc_messages" msgid="7821999071003699236">"Read and write သင်၏ စာတို၊ အီးမေးလ်၊ နှင့် အခြား စာများကို ဖတ်ခြင်း နှင့် ရေးခြင်း။"</string>
+ <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"သင့်ကိုယ်ပိုင်ရေးရာအချက်အလက်များ"</string>
<string name="permgroupdesc_personalInfo" msgid="8426453129788861338">"အဆက်အသွယ်ကဒ်ထဲ၌ သိမ်းဆည်းထားသော သင့် သတင်းအချက်အလက်များအား တိုက်ရိုက်အသုံးပြုခွင့် ရယူရန်"</string>
<string name="permgrouplab_socialInfo" msgid="5799096623412043791">"သင်၏ ဆိုရှယ် သတင်းအချက်အလက်"</string>
<string name="permgroupdesc_socialInfo" msgid="7129842457611643493">"သင်၏ အဆက်အသွယ်များနှင့် ဆိုရှယ်လ် အဆက်အသွယ်များအား၏ သတင်းအချက်အလက်များအား တိုက်ရိုက်အသုံးပြုခွင့် ရယူရန်"</string>
- <string name="permgrouplab_location" msgid="635149742436692049">"သင့်တည်နေရာ"</string>
+ <string name="permgrouplab_location" msgid="635149742436692049">"သင့်တည်နေရာ"</string>
<string name="permgroupdesc_location" msgid="5704679763124170100">"သင် ရောက်ရှိနေသော တည်နေရာကို စောင့်ကြည့်ခြင်း"</string>
<string name="permgrouplab_network" msgid="5808983377727109831">"ကွန်ယက်ဆက်သွယ်မှု"</string>
<string name="permgroupdesc_network" msgid="4478299413241861987">"ကွန်ရက် စွမ်းဆောင်ချက် အမျိုးမျိုးအသုံးပြုခွင့်ပေးရန်"</string>
@@ -239,16 +239,16 @@
<string name="permgroupdesc_statusBar" msgid="6242593432226807171">"စက်ရဲ့ အခြေအနေပြ ဘား ဆက်တင်အား ပြင်ဆင်ရန်"</string>
<string name="permgrouplab_syncSettings" msgid="3341990986147826541">"ထပ်တူပြုဆက်တင်များ"</string>
<string name="permgroupdesc_syncSettings" msgid="7603195265129031797">"ထပ်တူညီအောင်လုပ်ရန်ဆက်တင်အား အသုံးပြုခွင့်ပေးရန်"</string>
- <string name="permgrouplab_accounts" msgid="3359646291125325519">"သင့်အကောင့်များ"</string>
- <string name="permgroupdesc_accounts" msgid="4948732641827091312">"ရရိှနိုင်သောအကောင့်များကို အသုံးပြုရန်"</string>
+ <string name="permgrouplab_accounts" msgid="3359646291125325519">"သင့်အကောင့်များ"</string>
+ <string name="permgroupdesc_accounts" msgid="4948732641827091312">"ရရိှနိုင်သောအကောင့်များကို အသုံးပြုရန်"</string>
<string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"စက်ပစ္စည်းအား ထိန်းချုပ်ရန်"</string>
<string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"ဖုန်း၏ စက်ပိုင်းဆိုင်ရာကို တိုက်ရိုက်ဝင်ရောက်ရန်"</string>
<string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"ဖုန်းခေါ်ဆိုမှုများ"</string>
- <string name="permgroupdesc_phoneCalls" msgid="7489701620446183770">"ဖုန်းခေါ်ဆိုမှုများကို စောင့်ကြည့်စစ်ဆေးခြင်း၊ မှတ်တမ်းတင်ခြင်းနှင့် စီမံခြင်း"</string>
+ <string name="permgroupdesc_phoneCalls" msgid="7489701620446183770">"ဖုန်းခေါ်ဆိုမှုများကို စောင့်ကြည့်စစ်ဆေးခြင်း၊ မှတ်တမ်းတင်ခြင်းနှင့် စီမံခြင်း"</string>
<string name="permgrouplab_systemTools" msgid="4652191644082714048">"စစ်စတန်ကိရိယာများ"</string>
- <string name="permgroupdesc_systemTools" msgid="8162102602190734305">"အဆင့်နိမ့်ဝင်ရောက်ကြည့်ခြင်းနှင့် စနစ်ကိုထိန်းချုပ်ခြင်း"</string>
+ <string name="permgroupdesc_systemTools" msgid="8162102602190734305">"အဆင့်နိမ့်ဝင်ရောက်ကြည့်ခြင်းနှင့် စနစ်ကိုထိန်းချုပ်ခြင်း"</string>
<string name="permgrouplab_developmentTools" msgid="3446164584710596513">"ဖွံ့ဖိြုးတိုးတက်မှုဆိုင်ရာ ကိရိယာများ"</string>
- <string name="permgroupdesc_developmentTools" msgid="7058828032358142018">"appကို တိုးတက်ပြုစုကြသူတို့သာ လိုအပ်နိုင်သည့် အင်္ဂါရပ်များ ဖြစ်သည်။"</string>
+ <string name="permgroupdesc_developmentTools" msgid="7058828032358142018">"appကို တိုးတက်ပြုစုကြသူတို့သာ လိုအပ်နိုင်သည့် အင်္ဂါရပ်များ ဖြစ်သည်။"</string>
<string name="permgrouplab_display" msgid="4279909676036402636">"တခြား အပလီကေးရှင်း အသွင်အပြင်"</string>
<string name="permgroupdesc_display" msgid="6051002031933013714">"တခြားအပလီကေးရှင်းများရဲ့ အသွင်အပြင်ကို အကျိုးသက်ရောက်စေရန်"</string>
<string name="permgrouplab_storage" msgid="1971118770546336966">"သိုလှောင်မှုများ"</string>
@@ -265,26 +265,26 @@
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ရိုက်သောစာများကို သေချာစွာ စစ်ဆေးပါ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"အရေးကြီးသော ကိုယ်ရေးအချက်အလက်များဖြစ်တဲ့ ခရက်ဒစ်ကဒ်နံပါတ်များနှင့် စကားဝှက်များ ပါဝင်ပါတယ်."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"အခြေအနေပြဘားအား အလုပ်မလုပ်ခိုင်းရန်သို့မဟုတ် မွမ်းမံရန်"</string>
- <string name="permdesc_statusBar" msgid="8434669549504290975">"appအား အခြေအနေပြ ဘားကို ပိတ်ခွင့် သို့မဟတ် စနစ် အိုင်ကွန်များကို ထည့်ခြင်း ဖယ်ရှားခြင်း ပြုလုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_statusBar" msgid="8434669549504290975">"appအား အခြေအနေပြ ဘားကို ပိတ်ခွင့် သို့မဟတ် စနစ် အိုင်ကွန်များကို ထည့်ခြင်း ဖယ်ရှားခြင်း ပြုလုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_statusBarService" msgid="7247281911387931485">"အခြေအနေပြနေရာ"</string>
- <string name="permdesc_statusBarService" msgid="716113660795976060">"appအား အခြေအနေပြ ဘားဖြစ်ခွင့် ပြုသည်။"</string>
- <string name="permlab_expandStatusBar" msgid="1148198785937489264">"အခြေအနေပြဘားအား ချဲ့/ပြန့်ခြင်း"</string>
- <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"appအား အခြေအနေပြ ဘားကို ချဲ့ခွင့် သို့မဟုတ် ခေါက်သိမ်းခွင့် ပြုသည်။"</string>
+ <string name="permdesc_statusBarService" msgid="716113660795976060">"appအား အခြေအနေပြ ဘားဖြစ်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_expandStatusBar" msgid="1148198785937489264">"အခြေအနေပြဘားအား ချဲ့/ပြန့်ခြင်း"</string>
+ <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"appအား အခြေအနေပြ ဘားကို ချဲ့ခွင့် သို့မဟုတ် ခေါက်သိမ်းခွင့် ပြုသည်။"</string>
<string name="permlab_install_shortcut" msgid="4279070216371564234">"အတိုကောက်များအား ထည့်သွင်းခြင်း"</string>
<string name="permdesc_install_shortcut" msgid="8341295916286736996">"အပလီကေးရှင်းအား အသုံးပြုသူ လုပ်ဆောင်ခြင်း မပါပဲ ပင်မ မြင်ကွင်းအား ပြောင်းလဲခွင့် ပေးခြင်း"</string>
<string name="permlab_uninstall_shortcut" msgid="4729634524044003699">"အတိုကောက်များ ဖယ်ထုတ်ခြင်း"</string>
<string name="permdesc_uninstall_shortcut" msgid="6745743474265057975">"အပလီကေးရှင်းအား အသုံးပြုသူ လုပ်ဆောင်ခြင်း မပါပဲ ပင်မ မြင်ကွင်းအား ဖယ်ရှားခွင့် ပေးခြင်း"</string>
<string name="permlab_processOutgoingCalls" msgid="3906007831192990946">"အထွက် ခေါ်ဆိုမှုများအား လမ်းလွှဲပြောင်းခြင်း"</string>
- <string name="permdesc_processOutgoingCalls" msgid="5156385005547315876">"appအား အပြင်သို့ ဖုန်းခေါ်ဆိုမှု အတွင်းမှာ ဆက်ခဲ့သည့် နံပါတ်ကို ကြည့်နိုင်ကာ ခေါ်ဆိုမှုကို အခြား နံပါတ် တစ်ခုသို့ ပြောင်းလဲပစ်ခြင်း သို့မဟုတ် ခေါ်ဆိုမှုကို လုံးဝ ဖျက်သိမ်းခွင့် ပြုသည်။"</string>
+ <string name="permdesc_processOutgoingCalls" msgid="5156385005547315876">"appအား အပြင်သို့ ဖုန်းခေါ်ဆိုမှု အတွင်းမှာ ဆက်ခဲ့သည့် နံပါတ်ကို ကြည့်နိုင်ကာ ခေါ်ဆိုမှုကို အခြား နံပါတ် တစ်ခုသို့ ပြောင်းလဲပစ်ခြင်း သို့မဟုတ် ခေါ်ဆိုမှုကို လုံးဝ ဖျက်သိမ်းခွင့် ပြုသည်။"</string>
<string name="permlab_receiveSms" msgid="8673471768947895082">"စာပို့ခြင်းအား လက်ခံရယူခြင်း (စာတိုစနစ်)"</string>
- <string name="permdesc_receiveSms" msgid="6424387754228766939">"အပလီကေးရှင်းအား စာတိုများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
+ <string name="permdesc_receiveSms" msgid="6424387754228766939">"အပလီကေးရှင်းအား စာတိုများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
<string name="permlab_receiveMms" msgid="1821317344668257098">"စာပို့ခြင်းအား လက်ခံရယူခြင်း (ရုပ်သံစာ)"</string>
- <string name="permdesc_receiveMms" msgid="533019437263212260">"အပလီကေးရှင်းအား ရုပ်သံစာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
- <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"အရေးပေါ်ထုတ်လွှင့်မှုများ လက်ခံခြင်း"</string>
- <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"appအား အရေးပေါ် ထုတ်လွှင့်သည့် စာများကို လက်ခံလျက် စီမံဆောင်ရွက်ခွင့် ပြုသည်။ ယင်း ခွင့်ပြုချက်မှာ စနစ် appများ အတွက်သာ ဖြစ်သည်။"</string>
+ <string name="permdesc_receiveMms" msgid="533019437263212260">"အပလီကေးရှင်းအား ရုပ်သံစာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
+ <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"အရေးပေါ်ထုတ်လွှင့်မှုများ လက်ခံခြင်း"</string>
+ <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"appအား အရေးပေါ် ထုတ်လွှင့်သည့် စာများကို လက်ခံလျက် စီမံဆောင်ရွက်ခွင့် ပြုသည်။ ယင်း ခွင့်ပြုချက်မှာ စနစ် appများ အတွက်သာ ဖြစ်သည်။"</string>
<string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"စာတိုများ ဖြန့်ဝေခြင်းစနစ်အား ဖတ်ခြင်း"</string>
<string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"အပလီကေးရှင်းကို သင်၏ စက်ပစ္စည်းမှ လက်ခံရရှိသော အများလွှင့်ထုတ်ချက်များကို ဖတ်ရန် ခွင့်ပြုသည်။ အများလွှင့်ထုတ်ချက်များသည် အရေးပေါ်အခြေအနေများကို သင့်အား သတိပေးရန် အချို့ နေရာများတွင် ပို့ပေးသည်။ အရေးပေါ်သတိပေးချက် ထုတ်လွှင့်ချက်ကို လက်ခံရရှိချိန်တွင်အန္တရာယ် ဖြစ်စေနိုင်သော အပလီကေးရှင်းများသည် သင့်စက်ပစ္စည်း၏ လုပ်ငန်းလည်ပတ်မှုနှင့် စွမ်းဆောင်မှုကို ဝင်စွက်ဖက်နိုင်သည်။"</string>
- <string name="permlab_sendSms" msgid="5600830612147671529">"စာတိုပို့စနစ်(SMS)ဖြင့် စာများ ပို့သည်"</string>
+ <string name="permlab_sendSms" msgid="5600830612147671529">"စာတိုပို့စနစ်(SMS)ဖြင့် စာများ ပို့သည်"</string>
<string name="permdesc_sendSms" msgid="7094729298204937667">"အပလီကေးရှင်းအား စာတိုပို့ခွင့် ပြုပါ။ မမျှော်လင့်သော ကုန်ကျမှု ဖြစ်နိုင်ပါသည်။ အန္တရာယ်ရှိ အပလီကေးရှင်းများမှ သင် မသိပဲ စာပို့ခြင်းများ ပြုလုပ်ခြင်းကြောင့် ပိုက်ဆံ အပို ကုန်စေနိုင်သည်"</string>
<string name="permlab_sendRespondViaMessageRequest" msgid="8713889105305943200">"စာပြန်မှုခြင်း အသိပေးခြင်း များ ပြုလုပ်ခြင်း"</string>
<string name="permdesc_sendRespondViaMessageRequest" msgid="7107648548468778734">"အပလီကေးရှင်းအား တခြား စာအပြန်အလှန် ပို့ဆောင်မှု ပေးသော အပလီကေးရှင်းများဆီကို ဖုန်းခေါ်ဆိုမှု များအတွက် စာပို့ခြင်းဖြင့် ပြန်လည် ဖြေဆိုသော တောင်းဆိုမှု များ ခွင့်ပြုခြင်း"</string>
@@ -292,16 +292,16 @@
<string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"အပလီကေးရှင်းအား တက်ဘလက် သို့မဟုတ် ဆင်းမ်ကဒ်မှာ သိမ်းဆည်းထားသော စာတိုများ ဖတ်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် အကြာင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှုကို ဂရုမပြုပဲ စာတိုအားလုံးကို ဖတ်နိုင်ပါလိမ်မည်။"</string>
<string name="permdesc_readSms" product="default" msgid="3695967533457240550">"အပလီကေးရှင်းအား ဖုန်း သို့မဟုတ် ဆင်းမ်ကဒ်မှာ သိမ်းဆည်းထားသော စာတိုများ ဖတ်ရှုခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် အကြာင်းအရာ သို့မဟုတ် ယုံကြည်စိတ်ချရမှုကို ဂရုမပြုပဲ စာတိုအားလုံးကို ဖတ်နိုင်ပါလိမ်မည်။"</string>
<string name="permlab_writeSms" msgid="3216950472636214774">"သင့်ရဲ့ စာပေးပို့ခြင်းများ ပြင်ခြင်း (စာတို နှင့် ရုပ်သံစာ)"</string>
- <string name="permdesc_writeSms" product="tablet" msgid="5160413947794501538">"appအား သင်၏ တက်ဘလက် သို့မဟုတ် ဆင်းမ်ကဒ်ထဲမှာ သိုလှောင်ထားသည့် စာတိုများသို့ ရေးခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စာတိုမျာကို ဖျက်ပစ်နိုင်သည်။"</string>
- <string name="permdesc_writeSms" product="default" msgid="7268668709052328567">"appအား သင်၏ ဖုန်း သို့မဟုတ် ဆင်းမ်ကဒ်ထဲမှာ သိုလှောင်ထားသည့် စာတိုများသို့ ရေးခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စာတိုမျာကို ဖျက်ပစ်နိုင်သည်။"</string>
+ <string name="permdesc_writeSms" product="tablet" msgid="5160413947794501538">"appအား သင်၏ တက်ဘလက် သို့မဟုတ် ဆင်းမ်ကဒ်ထဲမှာ သိုလှောင်ထားသည့် စာတိုများသို့ ရေးခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စာတိုမျာကို ဖျက်ပစ်နိုင်သည်။"</string>
+ <string name="permdesc_writeSms" product="default" msgid="7268668709052328567">"appအား သင်၏ ဖုန်း သို့မဟုတ် ဆင်းမ်ကဒ်ထဲမှာ သိုလှောင်ထားသည့် စာတိုများသို့ ရေးခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စာတိုမျာကို ဖျက်ပစ်နိုင်သည်။"</string>
<string name="permlab_receiveWapPush" msgid="5991398711936590410">"စာပို့ခြင်းအား လက်ခံရယူခြင်း (WAP)"</string>
- <string name="permdesc_receiveWapPush" msgid="748232190220583385">"အပလီကေးရှင်းအား WAP စာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
+ <string name="permdesc_receiveWapPush" msgid="748232190220583385">"အပလီကေးရှင်းအား WAP စာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string>
<string name="permlab_receiveBluetoothMap" msgid="7593811487142360528">"Bluetooth စာများလက်ခံမည် (MAP)"</string>
<string name="permdesc_receiveBluetoothMap" msgid="8656755936919466345">"Bluetooth MAP စာများကို app မှလက်ခံကာ အလုပ်လုပ်ရန် ခွင့်ပြင်မည်။ ဆိုလိုသည်မှာ app သည်သင့်အား မပြသဘဲ သင့်ကိရိယာသို့ပို့လိုက်သည့် စာများကို ထိန်းချုပ်နိုင် သို့မဟုတ် ဖျက်နိုင်ပါသည်။"</string>
- <string name="permlab_getTasks" msgid="6466095396623933906">"အလုပ်လုပ်နေကြသည့် appများကို ရယူခြင်း"</string>
+ <string name="permlab_getTasks" msgid="6466095396623933906">"အလုပ်လုပ်နေကြသည့် appများကို ရယူခြင်း"</string>
<string name="permdesc_getTasks" msgid="7454215995847658102">"အပလီကေးရှင်းအား လက်ရှိနဲ့ လတ်တလော လုပ်ဆောင်ခဲ့သော သတင်းအချက်အလက် အသေးစိတ်အား ထုတ်ယူခွင့်ပြုရန်။ အပလီကေးရှင်းမှ သင် ဘယ် အပလီကေးရှင်းများသုံးရှိကြောင့် တွေ့ရှိနိုင်ပါသည်"</string>
<string name="permlab_startTasksFromRecents" msgid="8990073877885690623">"မကြာမီ ထဲက တာဝန် တစ်ခုကို စတင်ရန်"</string>
- <string name="permdesc_startTasksFromRecents" msgid="7382133554871222235">"appအား တက်ကြွမန်နေဂျာ။မကြာမီတာဝန်အင်ဖို အရာကို သုံးပြီး တက်ကြွမန်နေဂျာ။မကြာမီတာဝန်စာရင်းရယူ() ထံမှ ပြန်လာခဲ့သည့် ရပ်စဲခံလိုက်ရသည့် တာဝန်ကို ဖွင့်တင်ရန် အတွက် သုံးခွင့်ပြုသည်။"</string>
+ <string name="permdesc_startTasksFromRecents" msgid="7382133554871222235">"appအား တက်ကြွမန်နေဂျာ။မကြာမီတာဝန်အင်ဖို အရာကို သုံးပြီး တက်ကြွမန်နေဂျာ။မကြာမီတာဝန်စာရင်းရယူ() ထံမှ ပြန်လာခဲ့သည့် ရပ်စဲခံလိုက်ရသည့် တာဝန်ကို ဖွင့်တင်ရန် အတွက် သုံးခွင့်ပြုသည်။"</string>
<string name="permlab_interactAcrossUsers" msgid="7114255281944211682">"အသုံးပြုသူများအကြား ဆက်ဆံခြင်း"</string>
<string name="permdesc_interactAcrossUsers" msgid="364670963623385786">"အပလီကေးရှင်းအား စက်ပေါ်ရှိ တစ်ယောက်ထက်ပိုသော အသုံးပြုသူများအတွက် လုပ်ဆောင်ချက်များ ပြုလုပ်ခွင့်ပေးပါ။ အန္တရာယ်ရှိသော အပလီကေးရှင်းများမှ ဒီအရာကို သုံးပြီး အသုံးပြုသူများအတွင်း ကာကွယ်မှုကို ဖောက်ဖျက်နိုင်ပါသည်"</string>
<string name="permlab_interactAcrossUsersFull" msgid="2567734285545074105">"အသုံးပြုသူများအကြား ဆက်ဆံရန် လိုင်စင် အပြည့်"</string>
@@ -310,9 +310,9 @@
<string name="permdesc_manageUsers" msgid="8409306667645355638">"အပလီကေးရှင်းအား အသုံးပြုသူများကို စီမံခန့်ခွဲခွင့် ပေးပါ။ ဥပမာ ကြည့်ရှုခြင်း၊ အသစ်ပြုလုပ်ခြင်း၊ ဖျက်စီးခြင်း"</string>
<string name="permlab_getDetailedTasks" msgid="6229468674753529501">"သုံးနေသော အပလီကေးရှင်းများ၏ အချက်အလက် ရယူခြင်း"</string>
<string name="permdesc_getDetailedTasks" msgid="153824741440717599">"အပလီကေးရှင်းအား လက်ရှိနဲ့ လတ်တလော လုပ်ဆောင်ခဲ့သော သတင်းအချက်အလက် အသေးစိတ်အား ထုတ်ယူခွင့်ပြုရန်။ အန္တရာယ်ရှိသော အပလီကေးရှင်းများမှ တခြား အပလီကေးရှင်းများရဲ့ အတွင်းကျသော သတင်းအချက်အလက်များအား တွေ့ရှိနိုင်ပါသည်။"</string>
- <string name="permlab_reorderTasks" msgid="2018575526934422779">"အလုပ်လုပ်နေကြသည့် appများကို ပြန်လည်စီစဉ်ခြင်း"</string>
+ <string name="permlab_reorderTasks" msgid="2018575526934422779">"အလုပ်လုပ်နေကြသည့် appများကို ပြန်လည်စီစဉ်ခြင်း"</string>
<string name="permdesc_reorderTasks" msgid="7734217754877439351">"အပလီကေးရှင်းအား နောက်ကွယ် နှင့် ရှေ့မှောက်တွင် လက်ရှိ လုပ်ဆောင်နေမှုများအား ဖယ်ခွင့် ပြုပါ။ သင့် ခွင့်ပြုချက်မပါပဲ လုပ်ဆောင်နိုင်ပါလိမ့်မည်"</string>
- <string name="permlab_removeTasks" msgid="6821513401870377403">"အလုပ်လုပ်နေကြသည့် appများကို ရပ်ခြင်း"</string>
+ <string name="permlab_removeTasks" msgid="6821513401870377403">"အလုပ်လုပ်နေကြသည့် appများကို ရပ်ခြင်း"</string>
<string name="permdesc_removeTasks" msgid="1394714352062635493">"အပလီကေးရှင်းအား စက်မှ လက်ရှိလုပ်ဆောင်နေမှုများအား ဖယ်ရှားခြင်းနှင့် ၎င်းတို့၏ အပလီကေးရှင်းများအား ရပ်တန့်စေရန် လုပ်ခွင့်ပြုပါ။ အန္တရာယ်ရှိ အပလီကေးရှင်းများက တခြား အပလီကေးရှင်းများ၏ အပြုအမူအား ဒုက္ခပေးနိုင်ပါသည်"</string>
<string name="permlab_manageActivityStacks" msgid="7391191384027303065">"လုပ်ဆောင်မှု စာရင်းများအား ထိန်းသိမ်းခြင်း"</string>
<string name="permdesc_manageActivityStacks" msgid="1615881933034084440">"အပလီကေးရှင်းအား တခြားအပလီကေးရှင်းများမှ လုပ်ဆောင်ချက်များအား ထပ်ထည့်ခွင့်၊ ဖယ်ခွင့်၊ ပြင်ဆင်ခွင့် ပေးခြင်း။ စိတ်ချရမှု မရှိသော အပလီကေးရှင်းဆိုလျှင် တခြား အပလီကေးရှင်းများရဲ့ လုပ်ငန်းဆောင်ရွက်ချက်များအား မှားယွင်းစေနိုင်ပါသည်"</string>
@@ -320,48 +320,48 @@
<string name="permdesc_startAnyActivity" msgid="997823695343584001">"ခွင့်ပြုချက်ကာကွယ်ခြင်း၊ သို့ အပြင်သို့ ထုတ်နိုင်မှု အခြေအနေများ မည်သို့ပင်ဖြစ်စေကာမူ အပလီကေးရှင်းအား လှုပ်ရှားမှုများအား စတင်ရန် ခွင့်ပြုပါ"</string>
<string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"ဖန်သားပြင်နှင့် လိုက်ဖက်မှုကို သတ်မှတ်ရန်"</string>
<string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"အပလီကေးရှင်းအား တခြား အပလီကေးရှင်းများ ဖန်သားပြင် ပြသမှုအား ထိန်းချုပ်ခွင့်ပြုပါ။ အန္တရာယ်ရှိ အပလီကေးရှင်းများက တခြားအပလီကေးရှင်းများ ဒုက္ခပေးနိုင်ပါသည်"</string>
- <string name="permlab_setDebugApp" msgid="3022107198686584052">"app ဒီဘာဂင် ဖွင့်ပေးခြင်း"</string>
+ <string name="permlab_setDebugApp" msgid="3022107198686584052">"app ဒီဘာဂင် ဖွင့်ပေးခြင်း"</string>
<string name="permdesc_setDebugApp" msgid="4474512416299013256">"အပလီကေးရှင်းအား တခြား အပလီကေးရှင်းအတွက် အမှားရှာဖွေပြင်ဆင်ခြင်း ခွင့်ပြုပါ။ အန္တရာယ်ရှိ အပလီကေးရှင်း ဒီခွင့်ပြုချက်အား သုံးပြီး တခြားအပလီကေးရှင်းအား ရပ်ပစ်နိုင်ပါသည်"</string>
<string name="permlab_changeConfiguration" msgid="4162092185124234480">"စနစ် ပြသမှုဆက်တင်များပြင်ရန်"</string>
<string name="permdesc_changeConfiguration" msgid="4372223873154296076">"အပလီကေးရှင်းအား လက်ရှိ အပြင်အဆင် ဥပမာ ဘာသာစကား၊ စာလုံးအကြီးအသေး များ ပြင်ခွင့် ပြုရန်"</string>
<string name="permlab_enableCarMode" msgid="5684504058192921098">"ကားမောင်းနေစဥ်စနစ်အား ရရှိစေခြင်း"</string>
- <string name="permdesc_enableCarMode" msgid="4853187425751419467">"appအား ကား မုဒ် ဖွင့်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"appအား ကား မုဒ် ဖွင့်ခွင့် ပြုသည်။"</string>
<string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"အခြား အပလီကေးရှင်းများအား ပိတ်ရန်"</string>
<string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"အပလီကေးရှင်းအား နောက်ကွယ်တွင် ဖွင့်ထားသော အခြားအပလီကေးရှင်းများရဲ့ လုပ်ဆောင်မှုများအား ရပ်ခွင့်ပေးပါ။ ဒီလိုလုပ်ခြင်းဖြင့် အခြား အပလီကေးရှင်းများ ရပ်တန့်သွားနိုင်ပါသည်"</string>
<string name="permlab_forceStopPackages" msgid="2329627428832067700">"အခြား appများ ရပ်ပစ်ရန် အကြပ်ကိုင်ခြင်း"</string>
- <string name="permdesc_forceStopPackages" msgid="5253157296183940812">"appအား အခြား appများ၏ အလုပ်ကို အတင်းအကြပ် ရပ်ပစ်ခွင့် ရှိသည်။"</string>
+ <string name="permdesc_forceStopPackages" msgid="5253157296183940812">"appအား အခြား appများ၏ အလုပ်ကို အတင်းအကြပ် ရပ်ပစ်ခွင့် ရှိသည်။"</string>
<string name="permlab_forceBack" msgid="652935204072584616">"appကို ပိတ်သွားရန် အကြပ်ကိုင်ခြင်း"</string>
- <string name="permdesc_forceBack" msgid="3892295830419513623">"appအား အရှေ့ပိုင်းမှ မည်သည့် လှုပ်ရှားမှုကို မဆို ပိတ်ခွင့် နှင့် နောက်ကို ပို့ခွင့် ရှိသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_forceBack" msgid="3892295830419513623">"appအား အရှေ့ပိုင်းမှ မည်သည့် လှုပ်ရှားမှုကို မဆို ပိတ်ခွင့် နှင့် နောက်ကို ပို့ခွင့် ရှိသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_dump" msgid="1681799862438954752">"စနစ်၏စက်တွင်းအခြအေနေများထံ ပြန်ထုတ်ခြင်း"</string>
- <string name="permdesc_dump" msgid="1778299088692290329">"appအား စနစ်၏ အတွင်းပိုင်း အခြေအနေကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများသည် ၎င်းတို့ အနေနှင့် ပုံမှန် ဘယ်တော့မှ မလိုအပ်သည့် ကိုယ်ရေး နှင့် လုံခြုံမှု အချက်အလက် အမျိုးမျိုးကို ရယူနိုင်ကြသည်။"</string>
+ <string name="permdesc_dump" msgid="1778299088692290329">"appအား စနစ်၏ အတွင်းပိုင်း အခြေအနေကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများသည် ၎င်းတို့ အနေနှင့် ပုံမှန် ဘယ်တော့မှ မလိုအပ်သည့် ကိုယ်ရေး နှင့် လုံခြုံမှု အချက်အလက် အမျိုးမျိုးကို ရယူနိုင်ကြသည်။"</string>
<string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ဖန်သားပြင်အကြောင်းအရာအားပြန်လည်ရယူရန်"</string>
- <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"appအား တက်ကြွ ဝင်ဒိုး၏ အကြောင်းအရာကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများက ဝင်ဒိုး၏ အကြောင်းအရာ တစ်ခုလုံးကို ရယူနိုင်ပြီး စကားဝှက်မှ လွဲပြီး ၎င်းထဲက စာသား တစ်ခုလုံးကို ဆန်းစစ်နိုင်သည်။"</string>
+ <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"appအား တက်ကြွ ဝင်ဒိုး၏ အကြောင်းအရာကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများက ဝင်ဒိုး၏ အကြောင်းအရာ တစ်ခုလုံးကို ရယူနိုင်ပြီး စကားဝှက်မှ လွဲပြီး ၎င်းထဲက စာသား တစ်ခုလုံးကို ဆန်းစစ်နိုင်သည်။"</string>
<string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ယာယီ ရယူခွင့် ပြုရန်"</string>
<string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"အပလီကေးရှင်းအား စက်အား ခဏတာ အသုံးပြုခွင့်ပေးပါ။ အန္တရာယ်ရှိ အပလီကေးရှင်းများမှ သုံးစွဲသူ မသိပဲ ရယူခြင်း လုပ်နိုင်ပါသည်"</string>
<string name="permlab_retrieveWindowToken" msgid="7154762602367758602">"ဝင်ဒိုး တိုကင်ကို ရယူခြင်း"</string>
- <string name="permdesc_retrieveWindowToken" msgid="668173747687795074">"အပလီကေးရှင်း တစ်ခုအား ဝင်ဒိုး တိုကင်ကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများက စနစ်လို အယောင်ဆောင်ကာ အပလီကေးရှင်း ဝင်ဒိုးနှင့် ခွင့်မပြုထားသည့် တုံ့ပြန်မှုကို ပြုလုပ်နိုင်သည်။"</string>
+ <string name="permdesc_retrieveWindowToken" msgid="668173747687795074">"အပလီကေးရှင်း တစ်ခုအား ဝင်ဒိုး တိုကင်ကို ရယူခွင့် ပြုသည်။ ကြံဖန် appများက စနစ်လို အယောင်ဆောင်ကာ အပလီကေးရှင်း ဝင်ဒိုးနှင့် ခွင့်မပြုထားသည့် တုံ့ပြန်မှုကို ပြုလုပ်နိုင်သည်။"</string>
<string name="permlab_frameStats" msgid="7056374987314361639">"ဘောင် စာရင်းအင်းများကို ရယူခြင်း"</string>
- <string name="permdesc_frameStats" msgid="4758001089491284919">"အပလီကေးရှင်း တစ်ခုအား မူဘောင် စာရင်းအင်းများကို စုစည်းစေနိုင်သည်။ ကြံဖန် appများက ဝင်ဒိုး၏ မူဘောင် စာရင်းအင်းများကို အခြား appများမှ စောင့်ကြည့်နိုင်သည်။"</string>
+ <string name="permdesc_frameStats" msgid="4758001089491284919">"အပလီကေးရှင်း တစ်ခုအား မူဘောင် စာရင်းအင်းများကို စုစည်းစေနိုင်သည်။ ကြံဖန် appများက ဝင်ဒိုး၏ မူဘောင် စာရင်းအင်းများကို အခြား appများမှ စောင့်ကြည့်နိုင်သည်။"</string>
<string name="permlab_filter_events" msgid="8675535648807427389">"အဖြစ်အပျက်များအား စစ်ထုတ်ခြင်း"</string>
<string name="permdesc_filter_events" msgid="8006236315888347680">"အပလီကေးရှင်းအား သုံးစွဲသူ လုပ်ဆောင်မှုကို မပြုလုပ်ခင် စစ်ဆေးပေးသော input filter မှတ်ပုံတင်ခွင့်ပြုရန်၊ အန္တရယယ် ရှိသော အပလီကေးရှင်းများမှ သုံးစွဲသူ မသိပဲ စနစ်ပုံရိပ်ပြမှုအား ထိန်းချုပ်နိုင်ပါသည်"</string>
<string name="permlab_shutdown" msgid="7185747824038909016">"တစိတ်တပိုင်းအားပိတ်ချရန်"</string>
- <string name="permdesc_shutdown" msgid="7046500838746291775">"လုပ်ဆောင်မှုမန်နေဂျာကို ပိတ်ထားသည့်အခြေအနေတွင်ထားသည်။ အပြီးပိတ်ခြင်းအား မပြုလုပ်ပါ။"</string>
+ <string name="permdesc_shutdown" msgid="7046500838746291775">"လုပ်ဆောင်မှုမန်နေဂျာကို ပိတ်ထားသည့်အခြေအနေတွင်ထားသည်။ အပြီးပိတ်ခြင်းအား မပြုလုပ်ပါ။"</string>
<string name="permlab_stopAppSwitches" msgid="4138608610717425573">"အပ်ပလီကေးရှင်းဖလှယ်ခြင်းမှ မဖြစ်စေရန်"</string>
- <string name="permdesc_stopAppSwitches" msgid="8262195802582255021">"အသုံးပြုသူကို အခြား appသို့ ခလုတ် ပြောင်းမရအောင် ဟန့်တားသည်။"</string>
+ <string name="permdesc_stopAppSwitches" msgid="8262195802582255021">"အသုံးပြုသူကို အခြား appသို့ ခလုတ် ပြောင်းမရအောင် ဟန့်တားသည်။"</string>
<string name="permlab_getTopActivityInfo" msgid="2537922311411546016">"အပလီကေးရှင်း အချက်အလက်များ ယူခြင်း"</string>
<string name="permdesc_getTopActivityInfo" msgid="2512448855496067131">"ကိုင်ဆောင်ထားသူအား လက်ရှိ အပလီကေးရှင်းမှ လျို့ဝှက် အချက်အလက်များအား ထုတ်ယူကြည့်ခွင့်ပြုခြင်း"</string>
- <string name="permlab_runSetActivityWatcher" msgid="892239094867182656">"app အားလုံး ဖွင့်တင်မှုကို စောင့်ကြည့်ခြင်း နှင့် ထိန်းချုပ်ခြင်း"</string>
- <string name="permdesc_runSetActivityWatcher" msgid="6003603162578577406">"appအား စနစ်မှ လှုပ်ရှားမှုများကို ဖွင့်လှစ်စတင်ပုံကို စောင့်ကြည့်လျက် ထိန်းချုပ်ခွင့် ပြုသည်။ ကြံဖန် appများက စနစ်ကို လုံးဝ ဖျက်ဆီးပစ်နိုင်ကြသည်။ ယင်း ခွင့်ပြုချက်မှာ တိုးတက်အောင် ပြုစုရာမှာသာ လိုအပ်ပြီး၊ ပုံမှန် အသုံးပြုမှု အတွက် လုံးဝ မဟုတ်ပါ။"</string>
+ <string name="permlab_runSetActivityWatcher" msgid="892239094867182656">"app အားလုံး ဖွင့်တင်မှုကို စောင့်ကြည့်ခြင်း နှင့် ထိန်းချုပ်ခြင်း"</string>
+ <string name="permdesc_runSetActivityWatcher" msgid="6003603162578577406">"appအား စနစ်မှ လှုပ်ရှားမှုများကို ဖွင့်လှစ်စတင်ပုံကို စောင့်ကြည့်လျက် ထိန်းချုပ်ခွင့် ပြုသည်။ ကြံဖန် appများက စနစ်ကို လုံးဝ ဖျက်ဆီးပစ်နိုင်ကြသည်။ ယင်း ခွင့်ပြုချက်မှာ တိုးတက်အောင် ပြုစုရာမှာသာ လိုအပ်ပြီး၊ ပုံမှန် အသုံးပြုမှု အတွက် လုံးဝ မဟုတ်ပါ။"</string>
<string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"package ပယ်ဖျက်မှု ထုတ်လွှင့်မှုအား ပေးပို့ပါ"</string>
- <string name="permdesc_broadcastPackageRemoved" msgid="6621901216207931089">"appအား app အထုပ် တစ်ခုကို ဖယ်ရှားပစ်လိုက်ကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အလုပ်လုပ်နေသည့် မည့်သည့် appကို မဆို သတ်ပစ်နိုင်သည်။"</string>
- <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"SMS-အားပို့ပြီး ထုတ်လွင့်မှုအားရယူခြင်း"</string>
- <string name="permdesc_broadcastSmsReceived" msgid="4152037720034365492">"appအား SMS ရရှိထားကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး ဝင်လာကြသည့် SMS စာများကို အတုလုပ်နိုင်သည်။"</string>
- <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"WAP-PUSH-အားပို့ပြီး ထုတ်လွင့်မှုအားရယူခြင်း"</string>
- <string name="permdesc_broadcastWapPush" msgid="4783402525039442729">"appအား WAP PUSH စာ ရရှိထားကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး ရရှိခဲ့သည့်MMS စာများကို လုပ်ကြံနိုင်သလို၊ မည်သည့် ဝက်ဘ် စာမျက်နှာ၏ အကြောင်းအရာကို မဆို လုပ်ကြံချက်များဖြင့် တိတ်တိတ်ပုန်း အစားထိုးနိုင်သည်။"</string>
- <string name="permlab_setProcessLimit" msgid="2451873664363662666">"အလုပ်လုပ်နေသောလုပ်ငန်းစဥ်နှုန်းအား ကန့်သတ်ခြင်း"</string>
- <string name="permdesc_setProcessLimit" msgid="7318061314040879542">"appအား အလုပ်လုပ်ကြမည့် လုပ်ငန်းစဉ်များ၏ အများဆုံး အရေအတွက်ကို ထိန်းချုပ်ခွင့် ပြုနိုင်သည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_broadcastPackageRemoved" msgid="6621901216207931089">"appအား app အထုပ် တစ်ခုကို ဖယ်ရှားပစ်လိုက်ကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အလုပ်လုပ်နေသည့် မည့်သည့် appကို မဆို သတ်ပစ်နိုင်သည်။"</string>
+ <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"SMS-အားပို့ပြီး ထုတ်လွင့်မှုအားရယူခြင်း"</string>
+ <string name="permdesc_broadcastSmsReceived" msgid="4152037720034365492">"appအား SMS ရရှိထားကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး ဝင်လာကြသည့် SMS စာများကို အတုလုပ်နိုင်သည်။"</string>
+ <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"WAP-PUSH-အားပို့ပြီး ထုတ်လွင့်မှုအားရယူခြင်း"</string>
+ <string name="permdesc_broadcastWapPush" msgid="4783402525039442729">"appအား WAP PUSH စာ ရရှိထားကြောင်း အကြောင်းကြားစာကို ထုတ်လွင့်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး ရရှိခဲ့သည့်MMS စာများကို လုပ်ကြံနိုင်သလို၊ မည်သည့် ဝက်ဘ် စာမျက်နှာ၏ အကြောင်းအရာကို မဆို လုပ်ကြံချက်များဖြင့် တိတ်တိတ်ပုန်း အစားထိုးနိုင်သည်။"</string>
+ <string name="permlab_setProcessLimit" msgid="2451873664363662666">"အလုပ်လုပ်နေသောလုပ်ငန်းစဥ်နှုန်းအား ကန့်သတ်ခြင်း"</string>
+ <string name="permdesc_setProcessLimit" msgid="7318061314040879542">"appအား အလုပ်လုပ်ကြမည့် လုပ်ငန်းစဉ်များ၏ အများဆုံး အရေအတွက်ကို ထိန်းချုပ်ခွင့် ပြုနိုင်သည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_setAlwaysFinish" msgid="550958507798796965">"နောက်ခံ အပလီကေးရှင်းအား မဖြစ်မနေပိတ်ရန်"</string>
- <string name="permdesc_setAlwaysFinish" msgid="7471310652868841499">"appအား လှုပ်ရှားမှုများ နောက်ခံသို့ သွားကြသည့်နှင့် ပြီးဆုံးခြင်း ရှိမရှိကို အမြဲတမ်း ထိန်းချုပ်ခွင့် ရှိသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
+ <string name="permdesc_setAlwaysFinish" msgid="7471310652868841499">"appအား လှုပ်ရှားမှုများ နောက်ခံသို့ သွားကြသည့်နှင့် ပြီးဆုံးခြင်း ရှိမရှိကို အမြဲတမ်း ထိန်းချုပ်ခွင့် ရှိသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်ပါ။"</string>
<string name="permlab_batteryStats" msgid="2789610673514103364">"ဘတ်ထရီ အခြေအနေအား ဖတ်ရန်"</string>
<string name="permdesc_batteryStats" msgid="5897346582882915114">"အပလီကေးရှင်းအား အနိမ့်ပိုင်း စက် အချက်အလက် ဘက်ထရီ အခြေအနေကို ကြည့်ခွင့်ပြုပါ။ အပလီကေးရှင်းမှ သင် အသုံးပြုသော အပလီကေးရှင်းများ၏ အသေးစိတ် သတင်းအချက်အလက်များကို ရှာဖွေရန် ခွင့်ပြုပါ။"</string>
<string name="permlab_updateBatteryStats" msgid="3719689764536379557">"ဘက်ထရီ အချက်အလက်အား ပြင်ရန်"</string>
@@ -370,27 +370,27 @@
<string name="permdesc_getAppOpsStats" msgid="6243887041577912877">"အပလီကေးရှင်းကို အပလီကေးရှင်း အသုံးပြုမှု အချက်အလက် စာရင်းများအား ယူသုံးခွင့် ပြုခြင်း။ ပုံမှန် အပလီကေးရှင်းများအတွက် မဟုတ်ပါ"</string>
<string name="permlab_updateAppOpsStats" msgid="8829097373851521505">"အပလီကေးရှင်း အသုံးပြုမှုအား ပြင်ဆင်ခြင်း"</string>
<string name="permdesc_updateAppOpsStats" msgid="50784596594403483">"အပလီကေးရှင်းကို အပလီကေးရှင်း အသုံးပြုမှု အချက်အလက် စာရင်းများအား ပြောင်းလဲခွင့် ပြုခြင်း။ ပုံမှန် အပလီကေးရှင်းများအတွက် မဟုတ်ပါ"</string>
- <string name="permlab_backup" msgid="470013022865453920">"စနစ်အရန်သိမ်းဆည်းမှုနှင့် ပြန်လည်ရယူရန် ထိန်းချုပ်ခြင်း"</string>
- <string name="permdesc_backup" msgid="6912230525140589891">"appအား စနစ်၏ ဘက်အာပ် နှင့် ပြန်လည် ဖေါ်ထုတ်ရေး ယန္တရားကို ထိန်းချုပ်ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
- <string name="permlab_confirm_full_backup" msgid="5557071325804469102">"အပြည့်အဝအရန်သိမ်းဆည်းရန် သို့မဟုတ် ပြန်လည်ရယူခြင်းအောက်ပရေးရှင်းအား အတည်ပြုရန်"</string>
- <string name="permdesc_confirm_full_backup" msgid="1748762171637699562">"appအား ဘက်အာပ် အတည်ပြုရေး UI အပြည့်အဝကို ဖွင့်တင်ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
- <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"ခွင့်မပြုထားသောဝင်ဒိုးမျာကို ဖော်ပြခြင်း"</string>
+ <string name="permlab_backup" msgid="470013022865453920">"စနစ်အရန်သိမ်းဆည်းမှုနှင့် ပြန်လည်ရယူရန် ထိန်းချုပ်ခြင်း"</string>
+ <string name="permdesc_backup" msgid="6912230525140589891">"appအား စနစ်၏ ဘက်အာပ် နှင့် ပြန်လည် ဖေါ်ထုတ်ရေး ယန္တရားကို ထိန်းချုပ်ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
+ <string name="permlab_confirm_full_backup" msgid="5557071325804469102">"အပြည့်အဝအရန်သိမ်းဆည်းရန် သို့မဟုတ် ပြန်လည်ရယူခြင်းအောက်ပရေးရှင်းအား အတည်ပြုရန်"</string>
+ <string name="permdesc_confirm_full_backup" msgid="1748762171637699562">"appအား ဘက်အာပ် အတည်ပြုရေး UI အပြည့်အဝကို ဖွင့်တင်ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
+ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"ခွင့်မပြုထားသောဝင်ဒိုးမျာကို ဖော်ပြခြင်း"</string>
<string name="permdesc_internalSystemWindow" msgid="7458387759461466397">"အပလီကေးရှင်း အတွင်းပိုင်းစနစ်သာ သုံးရန်သင့်သော ဝင်းဒိုးများ တည်ဆောက်ခွင့် ပြုပါ။ ပုံမှန် အပလီကေးရှင်းများအတွက် မရည်ရွယ်ပါ"</string>
<string name="permlab_systemAlertWindow" msgid="3543347980839518613">"တခြား အပလီကေးရှင်းပေါ်တွင် ထပ်ဆွဲရန်"</string>
<string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"အပလီကေးရှင်းအား အခြားအပလီကေးရှင်းများ သို့ တခြား အသုံးပြုသူ မြင်ရသော နေရာများပေါ်တွင် ထပ်၍ ရေးဆွဲခွင့် ပေးသည်။ ဒီခွင့်ပြုမှုဟာ သင် အပလီကေးရှင်းများနဲ့ အသုံးပြုရန် စီစဉ်ထားမှု သို့ သင် မြင်ရသောမြင်ကွင်းအား ပြောင်းလဲမှု ဖြစ်စေနိုင်သည်"</string>
<string name="permlab_setAnimationScale" msgid="2805103241153907174">"တကမ္ဘာလုံးဆိုင်ရာ လှုပ်ရှားသက်ဝင်နှုန်းမွမ်းမံခြင်း"</string>
<string name="permdesc_setAnimationScale" msgid="7690063428924343571">"အပလီကေးရှင်းအား စက်တစ်ခုလုံးနှင့်ဆိုင်သော သရုပ်ပြမှု အနှေး အမြန် နှုန်း အား အချိန်မရွေး ပြောင်းခွင့်ပြုပါ"</string>
<string name="permlab_manageAppTokens" msgid="1286505717050121370">"app တိုကင်များကို စီမံကွပ်ကဲခြင်း"</string>
- <string name="permdesc_manageAppTokens" msgid="8043431713014395671">"appအား၊ ၎င်းတို့၏ ပုံမှန် Z-အော်ဒါပေးမှုကို ကျော်လွှားပြီး၊ ၎င်းတို့၏ ကိုယ်ပိုင် တိုကင်များကို ဖန်တီးရန် နှင့် စီမံကွပ်ကဲခွင့်ကို ပြုသည်။ သာမန် appများ အတွက ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_manageAppTokens" msgid="8043431713014395671">"appအား၊ ၎င်းတို့၏ ပုံမှန် Z-အော်ဒါပေးမှုကို ကျော်လွှားပြီး၊ ၎င်းတို့၏ ကိုယ်ပိုင် တိုကင်များကို ဖန်တီးရန် နှင့် စီမံကွပ်ကဲခွင့်ကို ပြုသည်။ သာမန် appများ အတွက ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_freezeScreen" msgid="4708181184441880175">"ဖန်သားပြင်အား ရပ်တန့်စေခြင်း"</string>
<string name="permdesc_freezeScreen" msgid="8558923789222670064">"အပလီကေးရှင်းအား ဖန်သားပြည့် ပြသမှုအတွက် ပြောင်းလဲစဉ် ဖန်သားပြင်အား ခဏရပ်ခွင့်ပြုရန်"</string>
- <string name="permlab_injectEvents" msgid="1378746584023586600">"ခလုတ်များနှင့် ထိန်းချုပ်သည့်ခလုတ်များကို နှိပ်ခြင်း"</string>
- <string name="permdesc_injectEvents" product="tablet" msgid="206352565599968632">"appအား ၎င်းကိုယ်နှိုက်၏ ထည့်သွင်းမှုများ (ခလုတ် နှိပ်မှုများ၊ စသဖြင့်)ကို ထည့်ပေးခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး တက်ဘလက်၏ နေရာကို ရယူနိုင်သည်။"</string>
- <string name="permdesc_injectEvents" product="default" msgid="653128057572326253">"appအား ၎င်းကိုယ်နှိုက်၏ ထည့်သွင်းမှုများ (ခလုတ် နှိပ်မှုများ၊ စသဖြင့်)ကို ထည့်ပေးခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး ဖုန်း၏ နေရာကို ရယူနိုင်သည်။"</string>
- <string name="permlab_readInputState" msgid="469428900041249234">"သင်မည်သည်ကိုရိုက်သွင်းသည်နှင့် လှုပ်ရှားမှုများကို မှတ်တမ်းတင်ခြင်း"</string>
- <string name="permdesc_readInputState" msgid="8387754901688728043">"appအား သင် နှိပ်သည့် ခလုတ်များကို၊ သင်က အခြား app တစ်ခုနှင့် (စကားဝှက် ရိုက်ထည့်မှုလို) အပြန်အလှန် တုံ့ပြန်နေချိန်မှာတောင်၊ စောင့်ကြည့်ခွင့် ပြုသည်။"</string>
- <string name="permlab_bindInputMethod" msgid="3360064620230515776">"ထည့်သွင်းရန်နည်းလမ်းအား ဆက်ရန်"</string>
- <string name="permdesc_bindInputMethod" msgid="3250440322807286331">"စွဲကိုင်ထားသူအား ရိုက်ထည့်ရေး နည်းလမ်း၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_injectEvents" msgid="1378746584023586600">"ခလုတ်များနှင့် ထိန်းချုပ်သည့်ခလုတ်များကို နှိပ်ခြင်း"</string>
+ <string name="permdesc_injectEvents" product="tablet" msgid="206352565599968632">"appအား ၎င်းကိုယ်နှိုက်၏ ထည့်သွင်းမှုများ (ခလုတ် နှိပ်မှုများ၊ စသဖြင့်)ကို ထည့်ပေးခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး တက်ဘလက်၏ နေရာကို ရယူနိုင်သည်။"</string>
+ <string name="permdesc_injectEvents" product="default" msgid="653128057572326253">"appအား ၎င်းကိုယ်နှိုက်၏ ထည့်သွင်းမှုများ (ခလုတ် နှိပ်မှုများ၊ စသဖြင့်)ကို ထည့်ပေးခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး ဖုန်း၏ နေရာကို ရယူနိုင်သည်။"</string>
+ <string name="permlab_readInputState" msgid="469428900041249234">"သင်မည်သည်ကိုရိုက်သွင်းသည်နှင့် လှုပ်ရှားမှုများကို မှတ်တမ်းတင်ခြင်း"</string>
+ <string name="permdesc_readInputState" msgid="8387754901688728043">"appအား သင် နှိပ်သည့် ခလုတ်များကို၊ သင်က အခြား app တစ်ခုနှင့် (စကားဝှက် ရိုက်ထည့်မှုလို) အပြန်အလှန် တုံ့ပြန်နေချိန်မှာတောင်၊ စောင့်ကြည့်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_bindInputMethod" msgid="3360064620230515776">"ထည့်သွင်းရန်နည်းလမ်းအား ဆက်ရန်"</string>
+ <string name="permdesc_bindInputMethod" msgid="3250440322807286331">"စွဲကိုင်ထားသူအား ရိုက်ထည့်ရေး နည်းလမ်း၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindAccessibilityService" msgid="5357733942556031593">"အသုံးပြုမှု ပေးနိုင်သော ဆားဗစ်တစ်ခုနှင့် ပူးပေါင်းမှု ပြုရန်"</string>
<string name="permdesc_bindAccessibilityService" msgid="7034615928609331368">"ဖုန်းကိုင်ထားသူနဲ့ ရယူခွင့်ပြုသော ဆားဗစ်မှ ထိပ်ပိုင်းအင်တာဖေ့စ် ကို ပူပေါင်းခွင့်ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ။"</string>
<string name="permlab_bindPrintService" msgid="8462815179572748761">"စာထုတ်မှု ဆားဗစ်နှင့် ပူးပေါင်းခြင်း"</string>
@@ -400,82 +400,82 @@
<string name="permlab_bindNfcService" msgid="2752731300419410724">"NFC ဆားဗစ်နှင့်ပူးပေါင်းခြင်း"</string>
<string name="permdesc_bindNfcService" msgid="6120647629174066862">"ဖုန်းကိုင်ထားသူနှင့် NFC ထုတ်လွှတ်နေတဲ့ အပလီကေးရှင်း ကို ပူးပေါင်းခွင့် ပေးခြင်း၊. ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ"</string>
<string name="permlab_bindTextService" msgid="7358378401915287938">"စာတိုပို့ခြင်းဆားဗစ်နှင့် ပူးပေါင်းခြင်း"</string>
- <string name="permdesc_bindTextService" msgid="8151968910973998670">"စွဲကိုင်ထားသူအား စာသား ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindTextService" msgid="8151968910973998670">"စွဲကိုင်ထားသူအား စာသား ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindVpnService" msgid="4708596021161473255">"VPNဆားဗစ်နှင့် ပူးပေါင်းခြင်း"</string>
- <string name="permdesc_bindVpnService" msgid="2067845564581693905">"စွဲကိုင်ထားသူအား Vpn ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
- <string name="permlab_bindWallpaper" msgid="8716400279937856462">"နောက်ခံနှင့် ပူးပေါင်းခြင်း"</string>
- <string name="permdesc_bindWallpaper" msgid="7108428692595491668">"စွဲကိုင်ထားသူအား နောက်ခံ ပုံ၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindVpnService" msgid="2067845564581693905">"စွဲကိုင်ထားသူအား Vpn ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_bindWallpaper" msgid="8716400279937856462">"နောက်ခံနှင့် ပူးပေါင်းခြင်း"</string>
+ <string name="permdesc_bindWallpaper" msgid="7108428692595491668">"စွဲကိုင်ထားသူအား နောက်ခံ ပုံ၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindVoiceInteraction" msgid="5334852580713715068">"အသံ တုံ့ပြန်လုပ်ပေးသူ တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
- <string name="permdesc_bindVoiceInteraction" msgid="2345721766501778101">"စွဲကိုင်ထားသူအား အသံဖြင့် တုံ့ပြန်ရေး ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindVoiceInteraction" msgid="2345721766501778101">"စွဲကိုင်ထားသူအား အသံဖြင့် တုံ့ပြန်ရေး ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_manageVoiceKeyphrases" msgid="1252285102392793548">"အသံ သော့ချက် စကားရပ်များကို စီမံကွပ်ကဲရန်"</string>
- <string name="permdesc_manageVoiceKeyphrases" msgid="8476560722907530008">"စွဲကိုင်ထားသူအား စကားလုံးတို ရှာကြံရေး အတွက် သော့ချက် စကားရပ်များကို စီမံခွင့်ပြုသည်။သာမန် appများ အတွက် ဘယ်တော့မှ လိုအပ်မည် မဟုတ်။"</string>
+ <string name="permdesc_manageVoiceKeyphrases" msgid="8476560722907530008">"စွဲကိုင်ထားသူအား စကားလုံးတို ရှာကြံရေး အတွက် သော့ချက် စကားရပ်များကို စီမံခွင့်ပြုသည်။သာမန် appများ အတွက် ဘယ်တော့မှ လိုအပ်မည် မဟုတ်။"</string>
<string name="permlab_bindRemoteDisplay" msgid="1782923938029941960">"ထိန်းချုပ်ပြသခြင်း နဲ့ ပူးပေါင်းရန်"</string>
<string name="permdesc_bindRemoteDisplay" msgid="1261242718727295981">"ဖုန်းကိုင်ထားသူနဲ့ ထိန်းချုပ်ပြသမှုမှ ထိပ်ပိုင်းအင်တာဖေ့စ် ကို ပူးပေါင်းခွင့်ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ"</string>
- <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"ဝဒ်ဂျက်ဝန်ဆောင်မှုနှင့် ပူးပေါင်းရန်"</string>
- <string name="permdesc_bindRemoteViews" msgid="4717987810137692572">"စွဲကိုင်ထားသူအားဝီဂျက် ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"ဝဒ်ဂျက်ဝန်ဆောင်မှုနှင့် ပူးပေါင်းရန်"</string>
+ <string name="permdesc_bindRemoteViews" msgid="4717987810137692572">"စွဲကိုင်ထားသူအားဝီဂျက် ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindRouteProvider" msgid="4869394607915096847">"လမ်းကြောင်း စီမံပေးရေး ဝန်ဆောင်မှု တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
- <string name="permdesc_bindRouteProvider" msgid="4703804520859960329">"စွဲကိုင်ထားသူအား မှတ်ပုံတင်ထားသည့် လမ်းကြောင်း စီမံပေးသူ မည်သူနှင့်မဆို ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
- <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"စက်ပစ္စည်း ထိန်းချုပ်ခြင်းနှင့် တုံ့ပြန်မှု"</string>
- <string name="permdesc_bindDeviceAdmin" msgid="569715419543907930">"စွဲကိုင်ထားသူအား ကိရိယာ စီမံအုပ်ချုပ်သူထံသို့ ရည်ရွယ်ချက်များကို ပို့ခွင့် ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
- <string name="permlab_bindTvInput" msgid="5601264742478168987">"တီဗီ ထည့်သွင်းမှု တစ်ခုဆီသို့ ချိတ်တွဲပေးခြင်း"</string>
- <string name="permdesc_bindTvInput" msgid="2371008331852001924">"စွဲကိုင်ထားသူအား တီဗီ ထည့်သွင်းမှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindRouteProvider" msgid="4703804520859960329">"စွဲကိုင်ထားသူအား မှတ်ပုံတင်ထားသည့် လမ်းကြောင်း စီမံပေးသူ မည်သူနှင့်မဆို ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"စက်ပစ္စည်း ထိန်းချုပ်ခြင်းနှင့် တုံ့ပြန်မှု"</string>
+ <string name="permdesc_bindDeviceAdmin" msgid="569715419543907930">"စွဲကိုင်ထားသူအား ကိရိယာ စီမံအုပ်ချုပ်သူထံသို့ ရည်ရွယ်ချက်များကို ပို့ခွင့် ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_bindTvInput" msgid="5601264742478168987">"တီဗီ ထည့်သွင်းမှု တစ်ခုဆီသို့ ချိတ်တွဲပေးခြင်း"</string>
+ <string name="permdesc_bindTvInput" msgid="2371008331852001924">"စွဲကိုင်ထားသူအား တီဗီ ထည့်သွင်းမှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_modifyParentalControls" msgid="4611318225997592242">"မိဘ ထိန်းချုပ်မှုများကို မွမ်းမံရန်"</string>
- <string name="permdesc_modifyParentalControls" msgid="7438482894162282039">"ပိုင်ရှင်အား စနစ်၏ မိဘများ ထိန်းချုပ်ရေး ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ ပုံမှန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_modifyParentalControls" msgid="7438482894162282039">"ပိုင်ရှင်အား စနစ်၏ မိဘများ ထိန်းချုပ်ရေး ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ ပုံမှန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_manageDeviceAdmins" msgid="4248828900045808722">"စက်အက်မင်တစ်ယောက် ကို ထည့်ခြင်း သို့ ထုတ်ခြင်း"</string>
<string name="permdesc_manageDeviceAdmins" msgid="5025608167709942485">"အသုံးပြုသူအား အက်ဒ်မင်များအား ထည့်ခြင်း ထုတ်ခြင်း ပြုလုပ်ခွင့် ပေးခြင်း။ . ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ"</string>
<string name="permlab_setOrientation" msgid="3365947717163866844">"စကရင်အနေအထားအားပြောင်းခြင်း"</string>
- <string name="permdesc_setOrientation" msgid="3046126619316671476">"appအား မျက်နှာပြင် လည်မှုကို အချိန်မရွေး ရပ်ပစ်ခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_setOrientation" msgid="3046126619316671476">"appအား မျက်နှာပြင် လည်မှုကို အချိန်မရွေး ရပ်ပစ်ခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_setPointerSpeed" msgid="9175371613322562934">"မြားအမြန်နှုန်းအား ပြောင်းခြင်း"</string>
- <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"appအား မောက်စ်ကို သို့မဟုတ် ထရက်ပဲဒ် ညွှန်တံ၏ နှုန်းကို အချိန်မရွေး ပြောင်းခွင့် ရှိသည်။သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"appအား မောက်စ်ကို သို့မဟုတ် ထရက်ပဲဒ် ညွှန်တံ၏ နှုန်းကို အချိန်မရွေး ပြောင်းခွင့် ရှိသည်။သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"လက်ကွက် အပြင်အဆင်ပြောင်းရန်"</string>
<string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"အပလီကေးရှင်းအား လက်ကွက်အပြင်အဆင်အား ပြောင်းခွင့်ပြုပါ။ ပုံမှန် အပလီကေးရှင်းများတွင် မလိုအပ်ပါ။"</string>
<string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"appများသို့ Linux အချက်ပြမှု ပို့ခြင်း"</string>
- <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"appအား ပို့နေသော အချက်ပြမှုကို ရှိနေကြသည့် လုပ်ငန်းစဉ် အားလုံးထံသို့ ပို့ရေးကို တောင်းဆိုခွင့် ပေးသည်။"</string>
+ <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"appအား ပို့နေသော အချက်ပြမှုကို ရှိနေကြသည့် လုပ်ငန်းစဉ် အားလုံးထံသို့ ပို့ရေးကို တောင်းဆိုခွင့် ပေးသည်။"</string>
<string name="permlab_persistentActivity" msgid="8841113627955563938">"appကို အမြဲတမ်း အလုပ်လုပ်စေခြင်း"</string>
<string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"အပလီကေးရှင်းအား မှတ်ဉာဏ်ထဲတွင် ရေရှည်သိမ်းဆည်ထားရန် ခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် တခြားအပလီကေးရှင်းအများအတွက် မှတ်ဉာဏ်ရရှိမှု နည်းသွားနိုင်ပြီး တက်ဘလက်လည်း နှေးသွားနိုင်ပါသည်။"</string>
<string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"အပလီကေးရှင်းအား မှတ်ဉာဏ်ထဲတွင် ရေရှည်သိမ်းဆည်ထားရန် ခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် တခြားအပလီကေးရှင်းအများအတွက် မှတ်ဉာဏ်ရရှိမှု နည်းသွားနိုင်ပြီး ဖုန်းလည်း နှေးသွားနိုင်ပါသည်။"</string>
<string name="permlab_deletePackages" msgid="184385129537705938">"appများကို ဖျက်ရန်"</string>
- <string name="permdesc_deletePackages" msgid="7411480275167205081">"appအား အန်ဒရွိုက် အထုပ်များကို ဖျက်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် appများကို ဖျက်ပစ်နိုင်သည်။"</string>
+ <string name="permdesc_deletePackages" msgid="7411480275167205081">"appအား အန်ဒရွိုက် အထုပ်များကို ဖျက်ခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် appများကို ဖျက်ပစ်နိုင်သည်။"</string>
<string name="permlab_clearAppUserData" msgid="274109191845842756">"အခြား appများ၏ ဒေတာကို ဖျက်ရန်"</string>
- <string name="permdesc_clearAppUserData" msgid="4625323684125459488">"appအား အသုံးပြုသူ ဒေတာကို ရှင်းပစ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_clearAppUserData" msgid="4625323684125459488">"appအား အသုံးပြုသူ ဒေတာကို ရှင်းပစ်ခွင့် ပြုသည်။"</string>
<string name="permlab_deleteCacheFiles" msgid="3128665571837408675">"အခြား appများ၏ ကက်ရှများကို ဖျက်ရန်"</string>
- <string name="permdesc_deleteCacheFiles" msgid="3812998599006730196">"appအား ကက်ရှ ဖိုင်များကို ဖျက်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_deleteCacheFiles" msgid="3812998599006730196">"appအား ကက်ရှ ဖိုင်များကို ဖျက်ခွင့် ပြုသည်။"</string>
<string name="permlab_getPackageSize" msgid="7472921768357981986">"app သိုလှောင်မှု နေရာကို တိုင်းထွာခြင်း"</string>
- <string name="permdesc_getPackageSize" msgid="3921068154420738296">"appအား ၎င်း၏ ကုဒ်၊ ဒေတာ၊ နှင့် ကက်ရှ ဆိုက်များကို ရယူခွင့် ပြုသည်။"</string>
+ <string name="permdesc_getPackageSize" msgid="3921068154420738296">"appအား ၎င်း၏ ကုဒ်၊ ဒေတာ၊ နှင့် ကက်ရှ ဆိုက်များကို ရယူခွင့် ပြုသည်။"</string>
<string name="permlab_installPackages" msgid="2199128482820306924">"appများကို တိုက်ရိုက် တပ်ဆင်ခြင်း"</string>
- <string name="permdesc_installPackages" msgid="5628530972548071284">"appအား အန်ဒရွိုက် အထုပ် အသစ် သို့မဟုတ် မွမ်းမံပြီးကို တပ်ဆင်ခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး ထင်ရာလုပ်နိုင်သော ကြီးမားသည့် ခွင့်ပြုချက်များ ရှိမည့် appများကို ထည့်ပေးနိုင်ကြသည်။"</string>
+ <string name="permdesc_installPackages" msgid="5628530972548071284">"appအား အန်ဒရွိုက် အထုပ် အသစ် သို့မဟုတ် မွမ်းမံပြီးကို တပ်ဆင်ခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးပြုပြီး ထင်ရာလုပ်နိုင်သော ကြီးမားသည့် ခွင့်ပြုချက်များ ရှိမည့် appများကို ထည့်ပေးနိုင်ကြသည်။"</string>
<string name="permlab_clearAppCache" msgid="7487279391723526815">"app ကက်ရှ ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်"</string>
<string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"အပလီကေးရှင်းမှာ တခြား အပလီကေးရှင်းများမှ ဒေတာများအား ယာယီ သိုလှောင်မှုနေရာမှ ဖျက်ပစ်ပြီး နေရာလွတ် လုပ်ခွင့်ပြုပါ။ ဒီလိုလုပ်ခြင်းဖြင့် တခြား အပလီကေးရှင်းများ စတင်ရာတွင် နှေးကွေးမှု ဖြစ်စေနိုင်ပါသည်။"</string>
<string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"အပလီကေးရှင်းမှာ တခြား အပလီကေးရှင်းများမှ ဒေတာများအား ယာယီ သိုလှောင်မှုနေရာမှ ဖျက်ပစ်ပြီး နေရာလွတ် လုပ်ခွင့်ပြုပါ။ ဒီလိုလုပ်ခြင်းဖြင့် တခြား အပလီကေးရှင်းများ စတင်ရာတွင် နှေးကွေးမှု ဖြစ်စေနိုင်ပါသည်။"</string>
<string name="permlab_movePackage" msgid="3289890271645921411">"app အရင်းအမြစ်များကို ဖယ်ရှားခြင်း"</string>
- <string name="permdesc_movePackage" msgid="319562217778244524">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်းကို app၏ အရင်းအမြစ်များကို အတွင်းမှ အပြင်သို့ ရွှေ့ပြောင်းခြင်း နှင့် ပြောင်းပြန်လုပ်ခြင်းကို ခွင့်ပြုသည်။"</string>
+ <string name="permdesc_movePackage" msgid="319562217778244524">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်းကို app၏ အရင်းအမြစ်များကို အတွင်းမှ အပြင်သို့ ရွှေ့ပြောင်းခြင်း နှင့် ပြောင်းပြန်လုပ်ခြင်းကို ခွင့်ပြုသည်။"</string>
<string name="permlab_readLogs" msgid="6615778543198967614">"တုံ့ပြန်မှုလွယ်သောစာရင်းဒေတာအားဖတ်ခြင်း"</string>
- <string name="permdesc_readLogs" product="tablet" msgid="82061313293455151">"appအား စနစ်၏ လော့ဂ် ဖိုင် အမျိုးမျိုးတို့ကို ဖတ်ကြားခွင့် ပြုသည်။ သို့ဖြစ်၍ ၎င်းသည် သင်က တက်ဘလက်နှင့် ဘာတွေ လုပ်ကိုင်နေကြောင်း အထွေထွေ အချက်အလက်များကို၊ ဖြစ်နိုင်သည်မှာ ကိုယ်ရေး သို့မဟုတ် ပုဂ္ဂိုလ်ရေး အချက်အလက်များ အပါအဝင် တို့ကိုပါ၊ ရှာတွေ့သိလာနိုင်သည်။"</string>
- <string name="permdesc_readLogs" product="default" msgid="2063438140241560443">"appအား စနစ်၏ လော့ဂ် ဖိုင် အမျိုးမျိုးတို့ကို ဖတ်ကြားခွင့် ပြုသည်။ သို့ဖြစ်၍ ၎င်းသည် သင်က ဖုန်းနှင့် ဘာတွေ လုပ်ကိုင်နေကြောင်း အထွေထွေ အချက်အလက်များကို၊ ဖြစ်နိုင်သည်မှာ ကိုယ်ရေး သို့မဟုတ် ပုဂ္ဂိုလ်ရေး အချက်အလက်များ အပါအဝင် တို့ကိုပါ၊ ရှာတွေ့သိလာနိုင်သည်။"</string>
+ <string name="permdesc_readLogs" product="tablet" msgid="82061313293455151">"appအား စနစ်၏ လော့ဂ် ဖိုင် အမျိုးမျိုးတို့ကို ဖတ်ကြားခွင့် ပြုသည်။ သို့ဖြစ်၍ ၎င်းသည် သင်က တက်ဘလက်နှင့် ဘာတွေ လုပ်ကိုင်နေကြောင်း အထွေထွေ အချက်အလက်များကို၊ ဖြစ်နိုင်သည်မှာ ကိုယ်ရေး သို့မဟုတ် ပုဂ္ဂိုလ်ရေး အချက်အလက်များ အပါအဝင် တို့ကိုပါ၊ ရှာတွေ့သိလာနိုင်သည်။"</string>
+ <string name="permdesc_readLogs" product="default" msgid="2063438140241560443">"appအား စနစ်၏ လော့ဂ် ဖိုင် အမျိုးမျိုးတို့ကို ဖတ်ကြားခွင့် ပြုသည်။ သို့ဖြစ်၍ ၎င်းသည် သင်က ဖုန်းနှင့် ဘာတွေ လုပ်ကိုင်နေကြောင်း အထွေထွေ အချက်အလက်များကို၊ ဖြစ်နိုင်သည်မှာ ကိုယ်ရေး သို့မဟုတ် ပုဂ္ဂိုလ်ရေး အချက်အလက်များ အပါအဝင် တို့ကိုပါ၊ ရှာတွေ့သိလာနိုင်သည်။"</string>
<string name="permlab_anyCodecForPlayback" msgid="715805555823881818">"မည်သည့် မီဒီယာ ဒီကုဒ်ဒါမဆို ပြသရာတွင် သုံးရန်"</string>
<string name="permdesc_anyCodecForPlayback" msgid="8283912488433189010">"အပလီကေးရှင်းအား သွင်းထားသည့် မီဒီယာ ဒီကုဒ်ဒါ အား သုံးပြီး ဖွင့်ရန် ဒီကုဒ် လုပ်ခွင့် ပြုပါ"</string>
<string name="permlab_manageCaCertificates" msgid="1678391896786882014">"ယုံကြည်ရသော အကောင့်များအား ထိန်းသိမ်းခြင်း"</string>
<string name="permdesc_manageCaCertificates" msgid="4015644047196937014">"အပလီကေးရှင်းအား CA လက်မှတ်များအား ယုံကြည်စိတ်ချရသော အရာ အဖြစ် ထည့်ခွင့် ပြန်ထုတ်ခွင့် ပေးခြင်း။"</string>
- <string name="permlab_bindJobService" msgid="3637568367978271086">"အပလီကေးရှင်း၏ စီစဉ်ထားသည့် နောက်ခံ အလုပ်ကို လုပ်ကိုင်ရန်"</string>
+ <string name="permlab_bindJobService" msgid="3637568367978271086">"အပလီကေးရှင်း၏ စီစဉ်ထားသည့် နောက်ခံ အလုပ်ကို လုပ်ကိုင်ရန်"</string>
<string name="permdesc_bindJobService" msgid="3473288460524119838">"ဒီခွင့်ပြုချက်က တောင်းဆိုလာလျှင် အန်ဒရွိုက် စနစ်အား အပလီကေးရှင်းကို နောက်ခံမှာ အလုပ် လုပ်ကိုင်စေပါသည်။"</string>
<string name="permlab_diagnostic" msgid="8076743953908000342">"diagမှပိုင်ဆိုင်သော ရင်းနှီးမှုများကို ဖတ်/ရေးခြင်း"</string>
- <string name="permdesc_diagnostic" msgid="6608295692002452283">"appအား diag အုပ်စု ပိုင်ဆိုင်သည့် မည်သည့် အရင်းအမြစ်ကို မဆို ရေးခြင်း နှင့် ဖတ်ခြင်းကို ခွင့်ပြုသည်၊ ဥပမာ၊ /dev ထဲက ဖိုင်များ။ ၎င်းက စနစ်၏ တည်ငြိမ်မှု နှင့် လုံခြုံမှုကို ထိပါးနိုင်သည့် အလားအလာ ရှိသည်။ ထုတ်လုပ်သူ သို့မဟုတ် အော်ပရေတာက ဟာ့ဒ်ဝဲ ဆိုင်ရာ ပြဿနာ ရှာဖွေ စူးစမ်းမှု အတွက်သာ ၎င်းကို အသုံးပြုရမည်။"</string>
- <string name="permlab_changeComponentState" msgid="6335576775711095931">"app အစိတ်အပိုင်းများကို ဖွင့်ခြင်း သို့မဟုတ် ပိတ်ခြင်း"</string>
- <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"appအား အခြား app တစ်ခု၏ အစိတ်အပိုင်း တစ်ခုမှာ ဖွင့်ထားသည် ဖြစ်စေ ဖွင့်မထားသည် ဖြစ်စေ ပြောင်းလဲခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် တက်ဘလက်၏ လုပ်နိုင်စွမ်းကို ပိတ်ပစ်နိုင်သည်။ app၏ အစိတ်အပိုင်းများကို သုံးမရအောင်၊ စနစ်မမှန်အောင် သို့မဟုတ် အခြေအနေ မတည်ငြိမ်အောင် လုပ်၍ ရနိုင်သောကြောင့် ဒီ ခွင့်ပြုချက်ကို သုံးရာတွင် သတိထားရန် လိုအပ်သည်။"</string>
- <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"appအား အခြား app တစ်ခု၏ အစိတ်အပိုင်း တစ်ခုမှာ ဖွင့်ထားသည် ဖြစ်စေ ဖွင့်မထားသည် ဖြစ်စေ ပြောင်းလဲခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် ဖုန်း၏ လုပ်နိုင်စွမ်းကို ပိတ်ပစ်နိုင်သည်။ app၏ အစိတ်အပိုင်းများကို သုံးမရအောင်၊ စနစ်မမှန်အောင် သို့မဟုတ် အခြေအနေ မတည်ငြိမ်အောင် လုပ်၍ ရနိုင်သောကြောင့် ဒီ ခွင့်ပြုချက်ကို သုံးရာတွင် သတိထားရန် လိုအပ်သည်။"</string>
+ <string name="permdesc_diagnostic" msgid="6608295692002452283">"appအား diag အုပ်စု ပိုင်ဆိုင်သည့် မည်သည့် အရင်းအမြစ်ကို မဆို ရေးခြင်း နှင့် ဖတ်ခြင်းကို ခွင့်ပြုသည်၊ ဥပမာ၊ /dev ထဲက ဖိုင်များ။ ၎င်းက စနစ်၏ တည်ငြိမ်မှု နှင့် လုံခြုံမှုကို ထိပါးနိုင်သည့် အလားအလာ ရှိသည်။ ထုတ်လုပ်သူ သို့မဟုတ် အော်ပရေတာက ဟာ့ဒ်ဝဲ ဆိုင်ရာ ပြဿနာ ရှာဖွေ စူးစမ်းမှု အတွက်သာ ၎င်းကို အသုံးပြုရမည်။"</string>
+ <string name="permlab_changeComponentState" msgid="6335576775711095931">"app အစိတ်အပိုင်းများကို ဖွင့်ခြင်း သို့မဟုတ် ပိတ်ခြင်း"</string>
+ <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"appအား အခြား app တစ်ခု၏ အစိတ်အပိုင်း တစ်ခုမှာ ဖွင့်ထားသည် ဖြစ်စေ ဖွင့်မထားသည် ဖြစ်စေ ပြောင်းလဲခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် တက်ဘလက်၏ လုပ်နိုင်စွမ်းကို ပိတ်ပစ်နိုင်သည်။ app၏ အစိတ်အပိုင်းများကို သုံးမရအောင်၊ စနစ်မမှန်အောင် သို့မဟုတ် အခြေအနေ မတည်ငြိမ်အောင် လုပ်၍ ရနိုင်သောကြောင့် ဒီ ခွင့်ပြုချက်ကို သုံးရာတွင် သတိထားရန် လိုအပ်သည်။"</string>
+ <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"appအား အခြား app တစ်ခု၏ အစိတ်အပိုင်း တစ်ခုမှာ ဖွင့်ထားသည် ဖြစ်စေ ဖွင့်မထားသည် ဖြစ်စေ ပြောင်းလဲခွင့် ပြုသည်။ အကြံအဖန် appများက ၎င်းကို အသုံးပြုပြီး အရေးကြီးသည့် ဖုန်း၏ လုပ်နိုင်စွမ်းကို ပိတ်ပစ်နိုင်သည်။ app၏ အစိတ်အပိုင်းများကို သုံးမရအောင်၊ စနစ်မမှန်အောင် သို့မဟုတ် အခြေအနေ မတည်ငြိမ်အောင် လုပ်၍ ရနိုင်သောကြောင့် ဒီ ခွင့်ပြုချက်ကို သုံးရာတွင် သတိထားရန် လိုအပ်သည်။"</string>
<string name="permlab_grantRevokePermissions" msgid="4627315351093508795">"ခွင့်ပြုချက် ထောက်ခံခြင်း သို့ ပယ်ဖျက်ခြင်း"</string>
<string name="permdesc_grantRevokePermissions" msgid="4088642654085850662">"အပလီကေးရှင်းအား ကိုယ်တိုင် ဒါမှမဟုတ် တခြား အပလီကေးရှင်းအတွက် ခွင့်ပြုချက်များအား ခွင့်ပြုခြင်း၊ပယ်ဖျယ်ခြင်း လုပ်ခွင့်ပြုပါ။ အန္တရာယ်ရှိသော အပလီကေးရှင်းများမှ ဒီခွင့်ပြုချက်အားသုံးပြီး အခွင့်မရှိသော စွမ်းဆောင်ချက်များအား သုံးနိုင်ပါသည်"</string>
- <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ပိုကြိုက်သည့် appများကို သတ်မှတ်ခြင်း"</string>
- <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"appအား သင် နှစ်ခြုက်သည့် appများကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက ဖွင့်ထားသည့် appများကို တိတ်တဆိတ် ပြောင်းလဲပစ်ကာ၊ ရှိနေကြသည့် သင်၏ appများကို သင့်ထံမှ သင်၏ ကိုယ်ရေး ဒေတာများကို စုစည်းရန် ခိုင်းနိုင်သည်။"</string>
+ <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ပိုကြိုက်သည့် appများကို သတ်မှတ်ခြင်း"</string>
+ <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"appအား သင် နှစ်ခြုက်သည့် appများကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက ဖွင့်ထားသည့် appများကို တိတ်တဆိတ် ပြောင်းလဲပစ်ကာ၊ ရှိနေကြသည့် သင်၏ appများကို သင့်ထံမှ သင်၏ ကိုယ်ရေး ဒေတာများကို စုစည်းရန် ခိုင်းနိုင်သည်။"</string>
<string name="permlab_writeSettings" msgid="2226195290955224730">"စနစ်အပြင်အဆင်အား မွမ်းမံခြင်း"</string>
- <string name="permdesc_writeSettings" msgid="7775723441558907181">"appအား စနစ်၏ ဆက်တင် ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများက သင့် စနစ်၏ စီစဉ်ဖွဲ့စည်းမှုကို ဖျက်ဆီးပစ်နိုင်သည်။"</string>
+ <string name="permdesc_writeSettings" msgid="7775723441558907181">"appအား စနစ်၏ ဆက်တင် ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများက သင့် စနစ်၏ စီစဉ်ဖွဲ့စည်းမှုကို ဖျက်ဆီးပစ်နိုင်သည်။"</string>
<string name="permlab_writeSecureSettings" msgid="204676251876718288">"စနစ်အပြင်အဆင်လုံခြုံမှုအား မွမ်းမံခြင်း"</string>
- <string name="permdesc_writeSecureSettings" msgid="8159535613020137391">"appအား စနစ်၏ လုံခြုံစိတ်ချရသည့် ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
+ <string name="permdesc_writeSecureSettings" msgid="8159535613020137391">"appအား စနစ်၏ လုံခြုံစိတ်ချရသည့် ဒေတာကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
<string name="permlab_writeGservices" msgid="2149426664226152185">"ဂူဂဲလ်ဝန်ဆောင်မှုမြေပုံအားမွမ်းမံခြင်း"</string>
- <string name="permdesc_writeGservices" msgid="1287309437638380229">"appအယဒ Google ဝန်ဆောင်မှုများ မြေပုံကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
+ <string name="permdesc_writeGservices" msgid="1287309437638380229">"appအယဒ Google ဝန်ဆောင်မှုများ မြေပုံကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
<string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"အစတွင် လုပ်ဆောင်ရန်"</string>
- <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"appအား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး appက တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် တက်ဘလက်၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
- <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"appအား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး appက တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် ဖုန်း၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
+ <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"appအား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး appက တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် တက်ဘလက်၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
+ <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"appအား စနစ်၏ စတင်မှု ပြီးဆုံးသည့်နှင့် မိမိကိုမိမိ စတင်ခွင့် ပြုသည်။ သို့ဖြစ်၍ ဖုန်း စတင်မှုမှာ အချိန် ပိုကြာနိုင်ပြီး appက တချိန်လုံး အလုပ်လုပ်နေခြင်းကြောင့် ဖုန်း၏ အလုပ် တစ်ခုလုံးကို နှေးကွေးလာစေနိုင်သည်။"</string>
<string name="permlab_broadcastSticky" msgid="7919126372606881614">"ကြာရှည်ခံ ထုတ်လွှတ်မှု အားပေးပို့ခြင်း"</string>
<string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"အပလီကေးရှင်းအား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဒီထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မက်မိုရီ အသုံးများပြီး တက်ဘလက်နှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
<string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"အပလီကေးရှင်းအား ကြာရှည်ခံ ထုတ်လွှင့်မှု ပြုပါ။ ဒီထုတ်လွှင့်မှုများဟာ ထုတ်လွှင့်မှု ပြီးဆုံးပြီးသွားတည့်တိုင် ကျန်နေမည် ဖြစ်ပါသည်။ အလွန်အကျွံသုံးခြင်းကြောင့် မှတ်ဉာဏ်အသုံးများပြီး ဖုန်းနှေးခြင်း၊ မတည်ငြိမ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
@@ -495,32 +495,32 @@
<string name="permdesc_readProfile" product="default" msgid="5462475151849888848">"အပလီကေးရှင်းအား စက်မှာ သိမ်းထားသော သင့်နာမည် နှင့် အဆက်အသွယ် သတင်းအချက်အလက်များကဲ့သို့သော ကိုယ်ရေးကိုယ်တာ အချက်အလက်များအား ဖတ်ခွင့် ပြုခြင်း။ အပလီကေးရှင်းမှ သင့်အား သိရှိနိုင်ပြီး သင့်ကိုယ်ရေးအချက်အလက်များအား အခြားသူများကို ပေးပို့နိုင်ပါသည်"</string>
<string name="permlab_writeProfile" msgid="907793628777397643">"သင့်ရဲ့ အဆက်အသွယ်ကဒ် အား ပြင်ရန်"</string>
<string name="permdesc_writeProfile" product="default" msgid="5552084294598465899">"အပလီကေးရှင်းအား စက်မှာ သိမ်းထားသော သင့်နာမည် နှင့် အဆက်အသွယ် သတင်းအချက်အလက်များကဲ့သို့သော ကိုယ်ရေးကိုယ်တာ အချက်အလက်များအား ပြင်ဆင်ခွင့် သို့ ထည့်ခွင့် ပြုခြင်း။ အပလီကေးရှင်းမှ သင့်အား သိရှိနိုင်ပြီး သင့်ကိုယ်ရေးအချက်အလက်များအား အခြားသူများကို ပေးပို့နိုင်ပါသည်"</string>
- <string name="permlab_bodySensors" msgid="4871091374767171066">"ခန္ဓာကိုယ် အာရံခံကိရိယာများ (နှလုံးခုန်နှုန်း စောင့်ကြည့်စက် လို)"</string>
- <string name="permdesc_bodySensors" product="default" msgid="2998865085124153531">"appအား သင့် ခန္ဓာကိုယ် အတွင်းမှာ၊ နှလုံးခုန်နှုန်းလို၊ ဘာတွေ ဖြစ်ပျက်နေကြောင်းကို တိုင်းထွာရန် အသုံးပြုသည့် အာရုံခံကိရိယာများ ထံမှ ဒေတာများကို ရယူသုံးခွင့် ပေးထားသည်။"</string>
- <string name="permlab_readSocialStream" product="default" msgid="1268920956152419170">"သင့်လူမှုရေးရာအဖွဲ့အစည်းတွင်ရေးသားရန်"</string>
+ <string name="permlab_bodySensors" msgid="4871091374767171066">"ခန္ဓာကိုယ် အာရံခံကိရိယာများ (နှလုံးခုန်နှုန်း စောင့်ကြည့်စက် လို)"</string>
+ <string name="permdesc_bodySensors" product="default" msgid="2998865085124153531">"appအား သင့် ခန္ဓာကိုယ် အတွင်းမှာ၊ နှလုံးခုန်နှုန်းလို၊ ဘာတွေ ဖြစ်ပျက်နေကြောင်းကို တိုင်းထွာရန် အသုံးပြုသည့် အာရုံခံကိရိယာများ ထံမှ ဒေတာများကို ရယူသုံးခွင့် ပေးထားသည်။"</string>
+ <string name="permlab_readSocialStream" product="default" msgid="1268920956152419170">"သင့်လူမှုရေးရာအဖွဲ့အစည်းတွင်ရေးသားရန်"</string>
<string name="permdesc_readSocialStream" product="default" msgid="4255706027172050872">"အပလီကေးရှင်းအား သင်နှင့် သင့်သူငယ်ချင်းတို့၏ ဆိုရှယ်နက်ဝဘ်မှ နောက်ဆုံးပေါ် အချက်အလက်များအား အသုံးပြုခွင့်နင့် ထပ်တူညီအောင် လုပ်ဆောင်ခွင့် ပြုပါ။ သတင်းအချက်အလက် မျှဝေခြင်းတွင် သတိပြုရန် -- ဤသို့ ခွင့်ပြုခြင်းဖြင့် အပလီကေးရှင်းမှ ယုံကြည်စိတ်ချရမှုကို ဂရုမပြုပဲ သင် နှင့် သူငယ်ချင်းများကြား ဆက်သွယ်မှုများအား သိရှိနိုင်ပါသည်။ မှတ်ချက်။ ဤခွင့်ပြုချက်အား ဆိုရှယ်နက်ဝဘ် အားလုံးတွင် ခွင့်ပြုခြင်း မလုပ်သင့်ပါ။"</string>
- <string name="permlab_writeSocialStream" product="default" msgid="3504179222493235645">"သင့်လူမှုရေးရာအဖွဲ့အစည်းတွင်ရေးသားရန်"</string>
+ <string name="permlab_writeSocialStream" product="default" msgid="3504179222493235645">"သင့်လူမှုရေးရာအဖွဲ့အစည်းတွင်ရေးသားရန်"</string>
<string name="permdesc_writeSocialStream" product="default" msgid="3086557552204114849">"အပလီကေးရှင်းအား သူငယ်ချင်းများရဲ့ ဆိုရှယ်နက်ဝဘ်မှနောက်ဆုံးပေါ် အချက်အလက်များအား ဖန်သားပြင်ပေါ်တွင် ပြခွင့်ပြုရန်။ သတင်းအချက်အလက် မျှဝေခြင်းတွင် သတိပြုရန် -- ဤသို့ ခွင့်ပြုခြင်းဖြင့် အပလီကေးရှင်းမှ သူငယ်ချင်းများထံမှ လာသကဲ့သို့ သတင်းများ ပြုလုပ်နိုင်ပါသည်။ မှတ်ချက်၊ ဤခွင့်ပြုချက်အား ဆိုရှယ်နက်ဝဘ် အားလုံးတွင် ခွင့်ပြုခြင်း မလုပ်သင့်ပါ။"</string>
- <string name="permlab_readCalendar" msgid="5972727560257612398">"ပြက္ခဒိန်အဖြစ်အပျက်များနှင့် လှို့ဝှက်အချက်အလက်များအား ဖတ်ခြင်း"</string>
+ <string name="permlab_readCalendar" msgid="5972727560257612398">"ပြက္ခဒိန်အဖြစ်အပျက်များနှင့် လှို့ဝှက်အချက်အလက်များအား ဖတ်ခြင်း"</string>
<string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"အပလီကေးရှင်းအား တက်ဘလက်ထဲတွင် သိမ်းထားသော သူငယ်ချင်းနှင့် လုပ်ဖော်ကိုင်ဘက်များ၏ ပြက္ခဒိန် အဖြစ်အပျက်များအပါအဝင် အားလုံးကို ဖတ်ရှုခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် အပလီကေးရှင်းမှ ပြက္ခဒိန် အဖြစ်အပျက်များအား လျှို့ဝှက်မှု သို့ ဂရုပြုမှု ကို ထည့်သွင်းမစဉ်းစားပဲ သိမ်းဆည်းခြင်း၊ မျှဝေခြင်း ပြုလုပ်စေနိုင်ပါသည်"</string>
<string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"အပလီကေးရှင်းအားဖုန်းထဲတွင် သိမ်းထားသော သူငယ်ချင်းနှင့် လုပ်ဖော်ကိုင်ဘက်များ၏ ပြက္ခဒိန် အဖြစ်အပျက်များအပါအဝင် အားလုံးကို ဖတ်ရှုခွင့်ပြုပါ။ ဒီခွင့်ပြုချက်ကြောင့် အပလီကေးရှင်းမှ ပြက္ခဒိန် အဖြစ်အပျက်များအား လျှို့ဝှက်မှု သို့ ဂရုပြုမှု ကို ထည့်သွင်းမစဉ်းစားပဲ သိမ်းဆည်းခြင်း၊ မျှဝေခြင်း ပြုလုပ်စေနိုင်ပါသည်"</string>
- <string name="permlab_writeCalendar" msgid="8438874755193825647">"ပြက္ခဒိန်အဖြစ်အပျက်များကို ထပ်ထည့်ရန် သို့မဟုတ် မွမ်းမံရန်နှင့် ပိုင်ရှင်၏အသိမပေးပဲ ဧည့်သည်များထံ အီးမေးလ်ပို့ရန်"</string>
+ <string name="permlab_writeCalendar" msgid="8438874755193825647">"ပြက္ခဒိန်အဖြစ်အပျက်များကို ထပ်ထည့်ရန် သို့မဟုတ် မွမ်းမံရန်နှင့် ပိုင်ရှင်၏အသိမပေးပဲ ဧည့်သည်များထံ အီးမေးလ်ပို့ရန်"</string>
<string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"အပလီကေးရှင်းအား သင်၏ တက်ဘလက်တွင် သူငယ်ချင်း အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အပလီကေးရှင်းအား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
<string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"အပလီကေးရှင်းအား သင်၏ ဖုန်းတွင် သူငယ်ချင်း အလုပ်ဖော်များ အပါအဝင် သင်၏ ပြောင်းလဲအဖြစ်အပျက်များအား ထည့်ခြင်း၊ ထုတ်ခြင်းအား ခွင့်ပြုရန်။ ဤခွင့်ပြုချက်သည် အပလီကေးရှင်းအား သတင်းများပို့ခြင်းကို ပြက္ခဒိန်ပိုင်ရှင်ဆီမှ လာသလို အနေဖြင့် ပေးပို့ခြင်း သို့မဟုတ် အဖြစ်အပျက်များကို ပိုင်ရှင်မသိပဲ ပြင်ဆင်နိုင်ပါသည်။"</string>
<string name="permlab_accessMockLocation" msgid="8688334974036823330">"စမ်းသပ်ရန်အတွက် တည်နေရာပုံစံတုမူရင်း"</string>
<string name="permdesc_accessMockLocation" msgid="5808711039482051824">"စမ်းသပ်ရန် သို့ နေရာပြပံ့ပို့းမှု အသစ်သွင်းရန် တည်နေရာဇစ်မြစ်အတုကို ဖန်တီးပါ။ ဤသို့လုပ်ခြင်းအားဖြင့် အပလီကေးရှင်းမှ တည်နေရာကို ကျော်ဖြတ်ပြင်ဆင်ခြင်းနှင်ူ ဂျီပီအက်စ် သို့ နေရာပြပံ့ပိုးမှုကဲ့သို့သော အခြား တည်နေရာဇစ်မြစ်များ၏ အခြေအနေကို ပြန်ပို့ပေးနိုင်မည်ဖြစ်သည်။"</string>
- <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"တည်နေရာပံ့ပိုးမှုညွှန်ကြားချက်အပိုအား ဝင်ရောက်ကြည့်ခြင်း"</string>
- <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"appအား တည်နေရာ စီမံပေးရေး ညွှန်ကြားချက် အပိုများကို ရယူခွင့်ပြုသည်။ သို့ဖြစ်၍ appသည် GPS သို့မဟုတ် အခြား တည်နေရာ ရင်းမြစ်ကို သုံးကြသူတို့၏ လုပ်ငန်းများကို ဝင်စွက်ခွင့် ပြုနိုင်သည်။"</string>
- <string name="permlab_installLocationProvider" msgid="6578101199825193873">"တည်နေရာဝန်ဆောင်မှုပေးသူအားထည့်သွင်းရန်ခွင့်ပြုခြင်း"</string>
+ <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"တည်နေရာပံ့ပိုးမှုညွှန်ကြားချက်အပိုအား ဝင်ရောက်ကြည့်ခြင်း"</string>
+ <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"appအား တည်နေရာ စီမံပေးရေး ညွှန်ကြားချက် အပိုများကို ရယူခွင့်ပြုသည်။ သို့ဖြစ်၍ appသည် GPS သို့မဟုတ် အခြား တည်နေရာ ရင်းမြစ်ကို သုံးကြသူတို့၏ လုပ်ငန်းများကို ဝင်စွက်ခွင့် ပြုနိုင်သည်။"</string>
+ <string name="permlab_installLocationProvider" msgid="6578101199825193873">"တည်နေရာဝန်ဆောင်မှုပေးသူအားထည့်သွင်းရန်ခွင့်ပြုခြင်း"</string>
<string name="permdesc_installLocationProvider" msgid="9066146120470591509">"စမ်းသပ်ရန် သို့ နေရာပြပံ့ပို့းမှု အသစ်သွင်းရန် တည်နေရာဇစ်မြစ်အတုကို ဖန်တီးပါ။ ဤသို့လုပ်ခြင်းအားဖြင့် အပလီကေးရှင်းမှ တည်နေရာကို ကျော်ဖြတ်ပြင်ဆင်ခြင်းနှင်ူ ဂျီပီအက်စ် သို့ နေရာပြပံ့ပိုးမှုကဲ့သို့သော အခြား တည်နေရာဇစ်မြစ်များ၏ အခြေအနေကို ပြန်ပို့ပေးနိုင်မည်ဖြစ်သည်။"</string>
<string name="permlab_accessFineLocation" msgid="1191898061965273372">"တည်နေရာ အတိအကျ (ဂျီပီအက်စ် နှင့် ကွန်ရက်အခြေခံ)"</string>
<string name="permdesc_accessFineLocation" msgid="5295047563564981250">"အပလီကေးရှင်းမှ သင့်ရဲ့ တိကျသောနေရာကို ဂျီပီအက်စ် သို့ ဆယ်လူလာတာဝါတိုင်၊ ဝိုင်ဖိုင် အချက်အလက်များ သုံးပြီး ရှာခြင်း ခွင့်ယူပါ။ နေရာပြ ဆားဗစ်များ စက်ပေါ်မှာ ရှိရမှာ ဖြစ်သလို ဖွင့်ထားရမှာလည်း ဖြစ်ပါသည်။ အပလီကေးရှင်းမှ ဒီဆားဗစ်များကို သုံး၍ ရှာဖွေသောကြောင့် ဘက်ထရီ ပိုကုန်နိုင်ပါသည်။"</string>
<string name="permlab_accessCoarseLocation" msgid="4887895362354239628">"အကြမ်းဖျင်းနေရာ (ကွန်ရက်အခြေခံ)"</string>
<string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"သင့်ရဲ့ ပျမ်းမျတည်နေရာကို အပလီကေးရှင်း အား သိခွင့် ပြုရန်။ ဒီ တည်နေရာကို တည်နေရာရှာဖွေရေး ဆားဗစ်မှ မိုဘိုင်း တာဝါတိုင်၊ ဝိုင်ဖိုင် စသည်တို့မှ တဆင့် ရယူပါသည်။ အပလီကေးရှင်း အနေဖြင့် ဒီ ဆားဗစ်များ ရှိနေရန် လိုအပ်ပါသည်။ ဒီအရာများကို အသုံးပြု၍ သင့်နေရာကို သိနိုင်ပါသည်။"</string>
<string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"SurfaceFlingerအား ချိတ်ဆက်ရန်"</string>
- <string name="permdesc_accessSurfaceFlinger" msgid="1041619516733293551">"ဒီ appအား InputFlinger အဆင့်နိမ့် အင်္ဂါရပ်များကို သုံးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_accessSurfaceFlinger" msgid="1041619516733293551">"ဒီ appအား InputFlinger အဆင့်နိမ့် အင်္ဂါရပ်များကို သုံးခွင့် ပြုသည်။"</string>
<string name="permlab_readFrameBuffer" msgid="6690504248178498136">"frame bufferအားဖတ်ခြင်း"</string>
- <string name="permdesc_readFrameBuffer" msgid="4937405521809454680">"appအား ဘောင် စပ်ကြား နေရာ ထဲက အကြောင်းအရာကို ဖတ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_readFrameBuffer" msgid="4937405521809454680">"appအား ဘောင် စပ်ကြား နေရာ ထဲက အကြောင်းအရာကို ဖတ်ခွင့် ပြုသည်။"</string>
<string name="permlab_accessInputFlinger" msgid="5348635270689553857">"InputFlinger အား သုံးခွင့်"</string>
<string name="permdesc_accessInputFlinger" msgid="2104864941201226616">"အပလီကေးရှင်းကို InputFlinger low-level features ပေးသုံးခြင်း"</string>
<string name="permlab_configureWifiDisplay" msgid="5595661694746742168">"ဝိုင်ဖိုင်ဖြင့် ပြသမှုအား ပြင်ဆင်ရန်"</string>
@@ -529,23 +529,23 @@
<string name="permdesc_controlWifiDisplay" msgid="4543912292681826986">"အပလီကေးရှင်းအား စက်ရဲ့ အနိမ့်ပိုင်းမှာ ရှိသော ဝိုင်ဖိုင် ပြသမှုအား ထိန်းချုပ်ခွင့်ပြုပါ"</string>
<string name="permlab_captureAudioOutput" msgid="6857134498402346708">"အသံထွက်မှု အား ဖမ်းယူခြင်း"</string>
<string name="permdesc_captureAudioOutput" msgid="6210597754212208853">"အပလီကေးရှင်းကို အသံဖမ်းခွင့် လမ်းကြောင်းလွှဲခွင့်များ ခွင့်ပြုခြင်း"</string>
- <string name="permlab_captureAudioHotword" msgid="1890553935650349808">"အသံဖြင့်ညွှန်ကြားရန်အတိုကောက်များအား ဖမ်းယူ သိနိုင်မှု"</string>
- <string name="permdesc_captureAudioHotword" msgid="9151807958153056810">"အပလီကေးရှင်းကို အသံဖြင့်ညွှန်းကြားရန်အတိုကောက်များ အတွက် အသံဖမ်းယူခွင့်ပြုခြင်း။ နောက်ကွယ်မှာ ဖြစ်နိုင်ပေမယ့် တခြားအသံဖမ်းခြင်းများ (ဥပမာ ရုပ်သံဖမ်းစက်) များကို ပိတ်ပင်မှု မဖြစ်စေပါ"</string>
+ <string name="permlab_captureAudioHotword" msgid="1890553935650349808">"အသံဖြင့်ညွှန်ကြားရန်အတိုကောက်များအား ဖမ်းယူ သိနိုင်မှု"</string>
+ <string name="permdesc_captureAudioHotword" msgid="9151807958153056810">"အပလီကေးရှင်းကို အသံဖြင့်ညွှန်းကြားရန်အတိုကောက်များ အတွက် အသံဖမ်းယူခွင့်ပြုခြင်း။ နောက်ကွယ်မှာ ဖြစ်နိုင်ပေမယ့် တခြားအသံဖမ်းခြင်းများ (ဥပမာ ရုပ်သံဖမ်းစက်) များကို ပိတ်ပင်မှု မဖြစ်စေပါ"</string>
<string name="permlab_modifyAudioRouting" msgid="7738060354490807723">"အသံ လမ်းကြောင်း"</string>
- <string name="permdesc_modifyAudioRouting" msgid="7205731074267199735">"အက်ပ်အား အသံ လမ်းကြောင်းကို တိုက်ရိုက် ထိန်းချုပ်ခွင့် နှင့် အသံ မူဝါဒ ဆုံးဖြတ်ချက်များကို ကျော်ပြီးလုပ်ပိုင်ခွင့် ပေးသည်။"</string>
+ <string name="permdesc_modifyAudioRouting" msgid="7205731074267199735">"အက်ပ်အား အသံ လမ်းကြောင်းကို တိုက်ရိုက် ထိန်းချုပ်ခွင့် နှင့် အသံ မူဝါဒ ဆုံးဖြတ်ချက်များကို ကျော်ပြီးလုပ်ပိုင်ခွင့် ပေးသည်။"</string>
<string name="permlab_captureVideoOutput" msgid="2246828773589094023">"ရုပ်သံလွှင့်မှုအား ဖမ်းယူရန်"</string>
<string name="permdesc_captureVideoOutput" msgid="359481658034149860">"အပလီကေးရှင်းကို ရုပ်သံဖမ်းခွင့် လမ်းကြောင်းလွှဲခွင့်များ ခွင့်ပြုခြင်း"</string>
<string name="permlab_captureSecureVideoOutput" msgid="7815398969303382016">"လုံခြုံသော ရုပ်သံလွှင့်မှုအား ဖမ်းယူရန်"</string>
<string name="permdesc_captureSecureVideoOutput" msgid="2779793064709350289">"အပလီကေးရှင်းကို လုံးခြုံစိတ်ချရသော အသံဖမ်းခြင်း လမ်းကြောင်းလွှဲခွင့်များ ခွင့်ပြုခြင်း"</string>
<string name="permlab_mediaContentControl" msgid="8749790560720562511">"မီဒီယာ ပလေးဘက် နဲ့ မက်တာဒေတာ အသုံးပြုခွင့် အား ထိန်းချုပ်ခြင်း"</string>
<string name="permdesc_mediaContentControl" msgid="1637478200272062">"အပလီကေးရှင်းအား ရုပ်သံ ပြန်လည်ပြသမှု နှင့် မီဒီယာ အချက်အလက် (ခေါင်းစဉ်၊ ရေးသားသူ) များကို ထိန်းချုပ်ခွင့် ပေးခြင်း"</string>
- <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"သင့်အသံအပြင်အဆင်အားပြောင်းခြင်း"</string>
+ <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"သင့်အသံအပြင်အဆင်အားပြောင်းခြင်း"</string>
<string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"အပလီကေးရှင်းအား အသံအတိုးအကျယ်နှင့် အထွက်ကို မည်သည့်စပီကာကို သုံးရန်စသည်ဖြင့် စက်တစ်ခုလုံးနှင့်ဆိုင်သော အသံဆိုင်ရာ ဆက်တင်များ ပြင်ဆင်ခွင့် ပြုရန်"</string>
<string name="permlab_recordAudio" msgid="3876049771427466323">"အသံဖမ်းခြင်း"</string>
- <string name="permdesc_recordAudio" msgid="4906839301087980680">"အပလီကေးရှင်းအား မိုက်ခရိုဖုန်းဖြင့် အသံသွင်းခွင့် ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် သင့် ခွင့်ပြုချက် မပါပဲ အချိန်မရွေး အသံဖမ်းနိုင်ပါမည်"</string>
+ <string name="permdesc_recordAudio" msgid="4906839301087980680">"အပလီကေးရှင်းအား မိုက်ခရိုဖုန်းဖြင့် အသံသွင်းခွင့် ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် သင့် ခွင့်ပြုချက် မပါပဲ အချိန်မရွေး အသံဖမ်းနိုင်ပါမည်"</string>
<string name="permlab_sim_communication" msgid="1180265879464893029">"ဆင်းမ်ကဒ် ဆက်သွယ်ရေး"</string>
<string name="permdesc_sim_communication" msgid="5725159654279639498">"အပလီကေးရှင်းအား ဆင်းမ်ကဒ်ဆီသို့ အမိန့်များ ပေးပို့ခွင့် ပြုခြင်း။ ဒီ ခွင့်ပြုမှုဟာ အန်တရယ် အလွန် ရှိပါသည်။."</string>
- <string name="permlab_camera" msgid="3616391919559751192">"ဓါတ်ပုံနှင့်ဗွီဒီယိုရိုက်ခြင်း"</string>
+ <string name="permlab_camera" msgid="3616391919559751192">"ဓါတ်ပုံနှင့်ဗွီဒီယိုရိုက်ခြင်း"</string>
<string name="permdesc_camera" msgid="8497216524735535009">"အပလီကေးရှင်းအား အလိုအလျောက် ဓာတ်ပုံရိုက်ခွင့်၊ ဗီဒီယို ရိုက်ကူးခွင့် ပြုပါ။ ဒီခွင့်ပြုချက်က အပလီကေးရှင်းကို အချိန်မရွေး ကင်မရာအား ခွင့်ပြုချက် မလိုအပ်ပဲ သုံးခွင့်ပြုပါသည်။"</string>
<string name="permlab_cameraDisableTransmitLed" msgid="2651072630501126222">"ထုတ်လွှင့်မှုပြ အချက်ပေး မီးအား ကင်မရာ သုံးနေစဉ် ပိတ်ရန်"</string>
<string name="permdesc_cameraDisableTransmitLed" msgid="4764585465480295341">"ကြိုတင်သွင်းထားသော စစ်စတန် စနစ်တစ်ခုကို ကင်မရာ သုံးနေသော မီးအား ထိန်းချုပ်ခွင့်ပေးခြင်း"</string>
@@ -555,131 +555,131 @@
<string name="permdesc_brick" product="default" msgid="5788903297627283099">"appအား ဖုန်း တစ်ခုလုံးကို ထာဝရ ပိတ်ပစ်ခွင် ပြုသည်။ ၎င်းမှာ အထူး အန္တရာယ် ရှိနိုင်သည်။"</string>
<string name="permlab_reboot" product="tablet" msgid="3436634972561795002">"တက်ပလက် မဖြစ်မနေပြန်လည်စတင်လုပ်ဆောင်ရန်"</string>
<string name="permlab_reboot" product="default" msgid="2898560872462638242">"ဖုန်းကို မဖြစ်မနေပြန်လည်စတင်လုပ်ဆောင်ရန်"</string>
- <string name="permdesc_reboot" product="tablet" msgid="8172056180063700741">"appအား တက်ဘလက်ကို ပြန်စတင်ရန် အတင်းအကြပ် ပြုလုပ်ခွင့် ပြုပါသည်။"</string>
- <string name="permdesc_reboot" product="default" msgid="5326008124289989969">"appအား ဖုန်းကို ပြန်စတင်ရန် အတင်းအကြပ် ပြုလုပ်ခွင့် ပြုပါသည်။"</string>
+ <string name="permdesc_reboot" product="tablet" msgid="8172056180063700741">"appအား တက်ဘလက်ကို ပြန်စတင်ရန် အတင်းအကြပ် ပြုလုပ်ခွင့် ပြုပါသည်။"</string>
+ <string name="permdesc_reboot" product="default" msgid="5326008124289989969">"appအား ဖုန်းကို ပြန်စတင်ရန် အတင်းအကြပ် ပြုလုပ်ခွင့် ပြုပါသည်။"</string>
<string name="permlab_mount_unmount_filesystems" product="nosdcard" msgid="2927361537942591841">"USBသိုလှောင်ရာဖိုင်စနစ်အား အသုံးပြုခွင့်ပေးရန်"</string>
<string name="permlab_mount_unmount_filesystems" product="default" msgid="4402305049890953810">"SDကတ် ဖိုင် စနစ် အား အသုံးပြုခွင့်ပေးရန်"</string>
- <string name="permdesc_mount_unmount_filesystems" msgid="1829290701658992347">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်း၏ ဖိုင် စနစ်များကို တပ်ဆင်ခြင်း နှင့် ဖြုတ်ခြင်းကို ပြုလုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_mount_unmount_filesystems" msgid="1829290701658992347">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်း၏ ဖိုင် စနစ်များကို တပ်ဆင်ခြင်း နှင့် ဖြုတ်ခြင်းကို ပြုလုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_mount_format_filesystems" product="nosdcard" msgid="6227819582624904972">"USBသိုလှောင်ရာအား ဖျက်ရန်"</string>
<string name="permlab_mount_format_filesystems" product="default" msgid="262582698639274056">"SDကတ်အား ဖျက်ရန်"</string>
- <string name="permdesc_mount_format_filesystems" msgid="8784268246779198627">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်းကို ပုံစံပြန်ချခွင့် ပြုသည်။"</string>
+ <string name="permdesc_mount_format_filesystems" msgid="8784268246779198627">"appအား ဖယ်ရှားရနိုင်သော သိုလှောင်ခန်းကို ပုံစံပြန်ချခွင့် ပြုသည်။"</string>
<string name="permlab_asec_access" msgid="3411338632002193846">"စက်တွင်းသိုလှောင်ခြင်း၏အချက်အလက်ရယူရန်"</string>
- <string name="permdesc_asec_access" msgid="3094563844593878548">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းထဲက အချက်အလက်များကို ရယူခွင့် ပြုသည်။"</string>
+ <string name="permdesc_asec_access" msgid="3094563844593878548">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းထဲက အချက်အလက်များကို ရယူခွင့် ပြုသည်။"</string>
<string name="permlab_asec_create" msgid="6414757234789336327">"စက်တွင်းသိုလှောင်ခြင်း ပြုလုပ်ဖန်တီးရန်"</string>
- <string name="permdesc_asec_create" msgid="4558869273585856876">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို ဖန်တီးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_asec_create" msgid="4558869273585856876">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို ဖန်တီးခွင့် ပြုသည်။"</string>
<string name="permlab_asec_destroy" msgid="526928328301618022">"စက်တွင်းသိုလှောင်ခြင်းအား ဖျက်စီးရန်"</string>
- <string name="permdesc_asec_destroy" msgid="7218749286145526537">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို ဖျက်ပစ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_asec_destroy" msgid="7218749286145526537">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို ဖျက်ပစ်ခွင့် ပြုသည်။"</string>
<string name="permlab_asec_mount_unmount" msgid="8877998101944999386">"အတွင်းပိုင်း သိုလှောင်ခန်းကို တပ်ဆင်/ဖြုတ်ခြင်း"</string>
- <string name="permdesc_asec_mount_unmount" msgid="3451360114902490929">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို တပ်ဆင်/ဖြုတ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_asec_mount_unmount" msgid="3451360114902490929">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို တပ်ဆင်/ဖြုတ်ခွင့် ပြုသည်။"</string>
<string name="permlab_asec_rename" msgid="7496633954080472417">"စက်တွင်းသိုလှောင်မှုအားအမည်ပြောင်းခြင်း"</string>
- <string name="permdesc_asec_rename" msgid="1794757588472127675">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို အမည်ပြောင်းခွင့် ပြုသည်။"</string>
+ <string name="permdesc_asec_rename" msgid="1794757588472127675">"appအား အတွင်းပိုင်း သိုလှောင်ခန်းကို အမည်ပြောင်းခွင့် ပြုသည်။"</string>
<string name="permlab_vibrate" msgid="7696427026057705834">"တုန်ခုန်မှုအား ထိန်းချုပ်ခြင်း"</string>
- <string name="permdesc_vibrate" msgid="6284989245902300945">"appအား တုန်ခါစက်ကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_vibrate" msgid="6284989245902300945">"appအား တုန်ခါစက်ကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_flashlight" msgid="2155920810121984215">"ဓါတ်မီးအား ထိန်းသိမ်းရန်"</string>
- <string name="permdesc_flashlight" msgid="6522284794568368310">"appအား ကား ဖလက်ရှမီးကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
- <string name="permlab_manageUsb" msgid="1113453430645402723">"USB စက်ပစ္စည်းများအတွက် ကြိုက်နှစ်သက်ရာနှင့်ခွင့်ပြုချက်များကို စီမံရန်"</string>
- <string name="permdesc_manageUsb" msgid="7776155430218239833">"appအား USB ကိရိယာများ၏ နှစ်ခြိုက်မှုများ နှင့် ခွင့်ပြုချက်များကို စီမံခန့်ခွဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_flashlight" msgid="6522284794568368310">"appအား ကား ဖလက်ရှမီးကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_manageUsb" msgid="1113453430645402723">"USB စက်ပစ္စည်းများအတွက် ကြိုက်နှစ်သက်ရာနှင့်ခွင့်ပြုချက်များကို စီမံရန်"</string>
+ <string name="permdesc_manageUsb" msgid="7776155430218239833">"appအား USB ကိရိယာများ၏ နှစ်ခြိုက်မှုများ နှင့် ခွင့်ပြုချက်များကို စီမံခန့်ခွဲခွင့် ပြုသည်။"</string>
<string name="permlab_accessMtp" msgid="4953468676795917042">"MTPပရိုတိုကောအား စတင်ရန်"</string>
- <string name="permdesc_accessMtp" msgid="6532961200486791570">"MTP USBပရိုတိုကော အကောင်အထည်ဖော်ဆောင်ရွက်ရန် kernel MTPဒရိုင်ဘာအား သုံးစွဲခွင့်ပြုမည်။"</string>
+ <string name="permdesc_accessMtp" msgid="6532961200486791570">"MTP USBပရိုတိုကော အကောင်အထည်ဖော်ဆောင်ရွက်ရန် kernel MTPဒရိုင်ဘာအား သုံးစွဲခွင့်ပြုမည်။"</string>
<string name="permlab_hardware_test" msgid="4148290860400659146">"စက်ပစ္စည်းများကိုစမ်းသပ်ခြင်း"</string>
- <string name="permdesc_hardware_test" msgid="6597964191208016605">"appအယဒ ဟာ့ဒ်ဝဲကို စမ်းသပ်ရန် ရည်ရွယ်ချက်ဖြင့် သာမည အစိတ်အပိုင်း အမျိုးမျိုးကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_hardware_test" msgid="6597964191208016605">"appအယဒ ဟာ့ဒ်ဝဲကို စမ်းသပ်ရန် ရည်ရွယ်ချက်ဖြင့် သာမည အစိတ်အပိုင်း အမျိုးမျိုးကို ထိန်းချုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_callPhone" msgid="3925836347681847954">"ဖုန်းနံပါတ်များကိုတိုက်ရိုက်ခေါ်ဆိုခြင်း"</string>
<string name="permdesc_callPhone" msgid="3740797576113760827">"အပလီကေးရှင်းအား အလိုအလျောက် ဖုန်းခေါ်ခွင့် ပြုပါ။ မလိုအပ်သော ဖုန်းခ များ ဖြစ်ပေါ်နိုင်ပါသည်။ ဒီခွင့်ပြုခြင်းမှာ အရေးပေါ်ဖုန်းခေါ်ခြင်း မပါဝင်ပါ။ သံသယဖြစ်စရာ အပလီကေးရှင်းများက သင့်မသိပဲ ဖုန်းခေါ်ခြင်းဖြင့် ဖုန်းခ ပိုမိုကျနိုင်ပါသည်။"</string>
- <string name="permlab_callPrivileged" msgid="4198349211108497879">"မည်သည့်ဖုန်းနံပါတ်မဆိုအားတိုက်ရိုက်ခေါ်ဆိုခြင်း"</string>
- <string name="permdesc_callPrivileged" msgid="1689024901509996810">"appအား ဘယ် ဖုန်း နံပါတ်ကိုမဆို၊ အရေးပေါ် နံပါတ်များ အပါအဝင်ကို၊ သင်၏ စွက်ဖက်မှု မပါဘဲ၊ ခေါ်ဆိုခွင့် ပြုသည်။ အကြံအဖန် appများက အရေးပေါ် ဝန်ဆောင်မှုများ ထံသို့ မလိုလားအပ်သော သို့မဟုတ် တရားမဝင်သော ခေါ်ဆိုမှုများ ပြုလုပ်လာနိုင်ကြမည်။"</string>
+ <string name="permlab_callPrivileged" msgid="4198349211108497879">"မည်သည့်ဖုန်းနံပါတ်မဆိုအားတိုက်ရိုက်ခေါ်ဆိုခြင်း"</string>
+ <string name="permdesc_callPrivileged" msgid="1689024901509996810">"appအား ဘယ် ဖုန်း နံပါတ်ကိုမဆို၊ အရေးပေါ် နံပါတ်များ အပါအဝင်ကို၊ သင်၏ စွက်ဖက်မှု မပါဘဲ၊ ခေါ်ဆိုခွင့် ပြုသည်။ အကြံအဖန် appများက အရေးပေါ် ဝန်ဆောင်မှုများ ထံသို့ မလိုလားအပ်သော သို့မဟုတ် တရားမဝင်သော ခေါ်ဆိုမှုများ ပြုလုပ်လာနိုင်ကြမည်။"</string>
<string name="permlab_performCdmaProvisioning" product="tablet" msgid="4842576994144604821">"CDMAတက်ပလက်အစသတ်မှတ်ခြင်းကို တိုက်ရိုက်စတင်ရန်"</string>
<string name="permlab_performCdmaProvisioning" product="default" msgid="5604848095315421425">"CDMAဖုန်း အစသတ်မှတ်ခြင်းကို တိုက်ရိုက်စတင်ရန်"</string>
- <string name="permdesc_performCdmaProvisioning" msgid="1994193538802314186">"appအား CDMA အတွက် စီမံလုပ်ကိုင်မှုကို စတင်ခွင့် ပြုသည်။ ကြံဖန် appများက မလိုအပ်ဘဲနှင့် CDMA အတွက် စီမံလုပ်ကိုင်မှုကို စတင်နိုင်ကြသည်။"</string>
- <string name="permlab_locationUpdates" msgid="7785408253364335740">"တည်နေရာအဆင့်မြှင့်ခြင်းသတိပေးချက်အားထိန်းချုပ်ရန်"</string>
- <string name="permdesc_locationUpdates" msgid="1120741557891438876">"appအား ရေဒီယိုထံမှ တည်နေရာ မွမ်းမံမှု အကြောင်းကြားစာများကို ပိတ်/ဖွင့်ခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်နိုင်ပါ။"</string>
+ <string name="permdesc_performCdmaProvisioning" msgid="1994193538802314186">"appအား CDMA အတွက် စီမံလုပ်ကိုင်မှုကို စတင်ခွင့် ပြုသည်။ ကြံဖန် appများက မလိုအပ်ဘဲနှင့် CDMA အတွက် စီမံလုပ်ကိုင်မှုကို စတင်နိုင်ကြသည်။"</string>
+ <string name="permlab_locationUpdates" msgid="7785408253364335740">"တည်နေရာအဆင့်မြှင့်ခြင်းသတိပေးချက်အားထိန်းချုပ်ရန်"</string>
+ <string name="permdesc_locationUpdates" msgid="1120741557891438876">"appအား ရေဒီယိုထံမှ တည်နေရာ မွမ်းမံမှု အကြောင်းကြားစာများကို ပိတ်/ဖွင့်ခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်နိုင်ပါ။"</string>
<string name="permlab_checkinProperties" msgid="7855259461268734914">"ချက်ခ်အင်ဂုဏ်သတ္တိများအား ဝင်ရောက်ချိတ်ဆက်ခြင်း"</string>
- <string name="permdesc_checkinProperties" msgid="4024526968630194128">"appအား စစ်ဆေးရေး ဝန်ဆောင်မှုက အာပ်လုဒ် လုပ်ခဲ့သည့် အရည်အချင်းများကို ရယူသုံးလျက် ရေး/ဖတ် ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
+ <string name="permdesc_checkinProperties" msgid="4024526968630194128">"appအား စစ်ဆေးရေး ဝန်ဆောင်မှုက အာပ်လုဒ် လုပ်ခဲ့သည့် အရည်အချင်းများကို ရယူသုံးလျက် ရေး/ဖတ် ခွင့် ပြုသည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
<string name="permlab_bindGadget" msgid="776905339015863471">"ဝဒ်ဂျက်အား ရွေးရန်"</string>
- <string name="permdesc_bindGadget" msgid="8261326938599049290">"appအား မည်သည့် ဝီဂျက်ကို မည်သည့် app သုံးနိုင်ကြောင်းကို စနစ်များ ပြောခွင့် ပေးသည်။ ယင်း ခွင့်ပြုချက်မျိုး ရှိသော appသည် အခြား appများအား ကိုယ်ရေး ဒေတာများကို ရယူသုံးခွင့် ပေးနိုင်သည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
+ <string name="permdesc_bindGadget" msgid="8261326938599049290">"appအား မည်သည့် ဝီဂျက်ကို မည်သည့် app သုံးနိုင်ကြောင်းကို စနစ်များ ပြောခွင့် ပေးသည်။ ယင်း ခွင့်ပြုချက်မျိုး ရှိသော appသည် အခြား appများအား ကိုယ်ရေး ဒေတာများကို ရယူသုံးခွင့် ပေးနိုင်သည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
<string name="permlab_modifyPhoneState" msgid="8423923777659292228">"ဖုန်းအခြေအနေအား မွမ်းမံခြင်း"</string>
- <string name="permdesc_modifyPhoneState" msgid="1029877529007686732">"appအား ဖုန်း၏ အင်္ဂါရပ်များကို ထိန်းချုပ်ခွင့် ပြုသည်။ ယင်း ခွင့်ပြုချက် ရှိသော appသည် ကွန်ရက်များကို ပြောင်းလဲခြင်း၊ ဖုန်း ရေဒီယိုကို ပိတ်ဖွင့်ခြင်း နှင့် အလားတူများကို သင့်ကို အကြောင်းတောင် မကြားဘဲ ပြုလုပ်နိုင်သည်။"</string>
+ <string name="permdesc_modifyPhoneState" msgid="1029877529007686732">"appအား ဖုန်း၏ အင်္ဂါရပ်များကို ထိန်းချုပ်ခွင့် ပြုသည်။ ယင်း ခွင့်ပြုချက် ရှိသော appသည် ကွန်ရက်များကို ပြောင်းလဲခြင်း၊ ဖုန်း ရေဒီယိုကို ပိတ်ဖွင့်ခြင်း နှင့် အလားတူများကို သင့်ကို အကြောင်းတောင် မကြားဘဲ ပြုလုပ်နိုင်သည်။"</string>
<string name="permlab_readPhoneState" msgid="9178228524507610486">"ဖုန်းရဲ့ အခြေအနေ နှင့် အမှတ်သညာအား ဖတ်ခြင်း"</string>
<string name="permdesc_readPhoneState" msgid="1639212771826125528">"အပလီကေးရှင်းအား ဖုန်းရဲ့ စွမ်းဆောင်ချက်များအား သုံးခွင့်ပြုပါ။ အပလီကေးရှင်းအနေဖြင့် ဖုန်းနံပါတ်၊ စက်နံပါတ်၊ ဖုန်းခေါ်နေမှု ရှိမရှိနှင့် တဖက်မှ ဖုန်းနံပါတ် များအား သိရှိနိုင်ပါသည်"</string>
<string name="permlab_readPrecisePhoneState" msgid="5476483020282007597">"ဖုန်းရဲ့ တိကျသော အခြေအနေအား ဖတ်ရှုခြင်း"</string>
<string name="permdesc_readPrecisePhoneState" msgid="6648009074263855418">"အပလီကေးရှင်းအား ဖုန်းရဲ့ အခြေအနေအတိအကျကို ယူသုံးခွင့် ပြုခြင်း။. ဒီအခွင့်အရေးက အပလီကေးရှင်း ကို ဖုန်းခေါ်ဆိုမှု အခြေအနေ၊ လက်ရှိ ဖုန်းခေါ်နေမှု ရှိမရှိ၊ ဒါမှမဟုတ် နောက်ခံမှာ ဖုန်းခေါ်နေမှု၊ ဖုန်းခေါ်ဆိုအောင်မြင်မှု၊ ဒေတာဆက်သွယ်မှု အခြေအနေ နဲ့ မအောင်မြင်မှု တွေကို သိရှိစေပါသည်။"</string>
<string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"တက်ပလက်အား ပိတ်ခြင်းမှ ကာကွယ်ခြင်း"</string>
<string name="permlab_wakeLock" product="default" msgid="573480187941496130">"ဖုန်းအနားယူခြင်းမပြုလုပ်စေရန်"</string>
- <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"appအား တက်ဘလက်ကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
- <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"appအား ဖုန်းကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
+ <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"appအား တက်ဘလက်ကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
+ <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"appအား ဖုန်းကို အနားမယူနိုင်အောင် ဟန့်တားခွင့် ပြုသည်။"</string>
<string name="permlab_transmitIr" msgid="7545858504238530105">"အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်း"</string>
<string name="permdesc_transmitIr" product="tablet" msgid="5358308854306529170">"အပလီကေးရှင်းအား တက်ဘလက်ရဲ့ အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်းအား သုံးခွင့်ပေးခြင်း"</string>
<string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"အပလီကေးရှင်းအား ဖုန်းရဲ့ အနီအောက်ရောင်ခြည် ထုတ်လွှတ်ခြင်းအား သုံးခွင့်ပေးခြင်း"</string>
- <string name="permlab_devicePower" product="tablet" msgid="2787034722616350417">"တက်ပလက်ဖွင့် (သို့)ပိတ်"</string>
- <string name="permlab_devicePower" product="default" msgid="4928622470980943206">"ဖုန်းဖွင့် (သို့)ပိတ်"</string>
- <string name="permdesc_devicePower" product="tablet" msgid="6689862878984631831">"appအား တက်ဘလက်ကို ဖွင့် သို့မဟုတ် ပိတ်ခွင့် ပြုသည်။"</string>
- <string name="permdesc_devicePower" product="default" msgid="6037057348463131032">"appအား ဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ခွင့် ပြုသည်။"</string>
- <string name="permlab_factoryTest" msgid="3715225492696416187">"စက်ရုံစမ်းသပ်စနစ်ဖြင့် အလုပ်လုပ်ဆောင်စေရန်"</string>
- <string name="permdesc_factoryTest" product="tablet" msgid="3952059318359653091">"ထုတ်လုပ်သူ၏အနိမ့်စားအဆင့်စမ်းသပ်မှုအနေဖြင့်လုပ်ဆောင်စေမည် တက်ပလက်စက်အား လုံးဝဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုမည်။ တက်ပလက်မှာ ထုတ်လုပ်သူ၏စမ်းသပ်မှုစနစ်ဖြင့် လုပ်ဆောင်နေစဥ်သာ ရရှိမည်။"</string>
- <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"ထုတ်လုပ်သူ၏အနိမ့်စားအဆင့်စမ်းသပ်မှုအနေဖြင့်လုပ်ဆောင်စေမည် ဖုန်းစက်အား လုံးဝဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုမည် ဖုန်းမှာ ထုတ်လုပ်သူ၏စမ်းသပ်မှုစနစ်ဖြင့် လုပ်ဆောင်နေစဥ်သာ ရရှိမည်"</string>
+ <string name="permlab_devicePower" product="tablet" msgid="2787034722616350417">"တက်ပလက်ဖွင့် (သို့)ပိတ်"</string>
+ <string name="permlab_devicePower" product="default" msgid="4928622470980943206">"ဖုန်းဖွင့် (သို့)ပိတ်"</string>
+ <string name="permdesc_devicePower" product="tablet" msgid="6689862878984631831">"appအား တက်ဘလက်ကို ဖွင့် သို့မဟုတ် ပိတ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_devicePower" product="default" msgid="6037057348463131032">"appအား ဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_factoryTest" msgid="3715225492696416187">"စက်ရုံစမ်းသပ်စနစ်ဖြင့် အလုပ်လုပ်ဆောင်စေရန်"</string>
+ <string name="permdesc_factoryTest" product="tablet" msgid="3952059318359653091">"ထုတ်လုပ်သူ၏အနိမ့်စားအဆင့်စမ်းသပ်မှုအနေဖြင့်လုပ်ဆောင်စေမည် တက်ပလက်စက်အား လုံးဝဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုမည်။ တက်ပလက်မှာ ထုတ်လုပ်သူ၏စမ်းသပ်မှုစနစ်ဖြင့် လုပ်ဆောင်နေစဥ်သာ ရရှိမည်။"</string>
+ <string name="permdesc_factoryTest" product="default" msgid="8136644990319244802">"ထုတ်လုပ်သူ၏အနိမ့်စားအဆင့်စမ်းသပ်မှုအနေဖြင့်လုပ်ဆောင်စေမည် ဖုန်းစက်အား လုံးဝဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုမည် ဖုန်းမှာ ထုတ်လုပ်သူ၏စမ်းသပ်မှုစနစ်ဖြင့် လုပ်ဆောင်နေစဥ်သာ ရရှိမည်"</string>
<string name="permlab_setWallpaper" msgid="6627192333373465143">"နောက်ခံအား သတ်မှတ်ရန်"</string>
- <string name="permdesc_setWallpaper" msgid="7373447920977624745">"appအား စနစ် နောက်ခံပုံကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_setWallpaper" msgid="7373447920977624745">"appအား စနစ် နောက်ခံပုံကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
<string name="permlab_setWallpaperHints" msgid="3278608165977736538">"နောက်ခံပုံအား အရွယ်အစားပြောင်းရန်"</string>
- <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"appအား စနစ် နောက်ခံပုံ ဆိုက်ဆိုင်ရာ ညွှန်းချက်များကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"appအား စနစ် နောက်ခံပုံ ဆိုက်ဆိုင်ရာ ညွှန်းချက်များကို သတ်မှတ်ခွင့် ပြုသည်။"</string>
<string name="permlab_masterClear" msgid="2315750423139697397">"စနစ်အား မူလစက်ရုံအခြအေနေထံ ပြန်လည်သတ်မှတ်ရန်"</string>
- <string name="permdesc_masterClear" msgid="3665380492633910226">"appအား စနစ်ကို စက်ရုံအတိုင်း လုံးဝ ပြန်ညှိခြင်း၊ ဒေတာများ၊ စီစင်ဖွဲ့စည်းမှု နှင့် တပ်ဆင်ပြီး appများ အားလုံးကို ဖျက်ပစ်ခြင်း လုပ်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_masterClear" msgid="3665380492633910226">"appအား စနစ်ကို စက်ရုံအတိုင်း လုံးဝ ပြန်ညှိခြင်း၊ ဒေတာများ၊ စီစင်ဖွဲ့စည်းမှု နှင့် တပ်ဆင်ပြီး appများ အားလုံးကို ဖျက်ပစ်ခြင်း လုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_setTime" msgid="2021614829591775646">"အချိန်သတ်မှတ်ရန်"</string>
- <string name="permdesc_setTime" product="tablet" msgid="1896341438151152881">"appအား တက်ဘလက်၏ နာရီ အချိန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
- <string name="permdesc_setTime" product="default" msgid="1855702730738020">"appအား ဖုန်း၏ နာရီ အချိန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_setTime" product="tablet" msgid="1896341438151152881">"appအား တက်ဘလက်၏ နာရီ အချိန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_setTime" product="default" msgid="1855702730738020">"appအား ဖုန်း၏ နာရီ အချိန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
<string name="permlab_setTimeZone" msgid="2945079801013077340">"အချိန်ဇုန်းအား သတ်မှတ်ခြင်း"</string>
- <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"appအား တက်ဘလက်၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
- <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"appအား ဖုန်း၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
- <string name="permlab_accountManagerService" msgid="4829262349691386986">"AccountManagerServiceအနေဖြင့်ပြုမူရန်"</string>
+ <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"appအား တက်ဘလက်၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"appအား ဖုန်း၏ နာရီ ဇုန်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permlab_accountManagerService" msgid="4829262349691386986">"AccountManagerServiceအနေဖြင့်ပြုမူရန်"</string>
<string name="permdesc_accountManagerService" msgid="1948455552333615954">"အပလီကေးရှင်းအား အကောင့် စစ်ဆေးသော အရာများအား ဖုန်းခေါ်ခွင့်ပြုပါ"</string>
<string name="permlab_getAccounts" msgid="1086795467760122114">"စက်ပေါ်မှာ အကောင့်များ ရှာဖွေခြင်း"</string>
<string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"အပလီကေးရှင်းအား တက်ဘလက်မှ သိရှိထားသော အကောင့်များအား ရယူခွင့်ပေးပါ။ ဒီထဲတွင် သင် ထည့်သွင်းထားသော အပလီကေးရှင်းများမှတဆင့် ပြုလုပ်ထားသော အကောင့်များပါ ပါဝင်နိုင်ပါသည်။"</string>
<string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"အပလီကေးရှင်းအား ဖုန်းမှ သိရှိထားသော အကောင့်စာရင်းများအား ရယူခွင့်ပေးပါ။ ဒီထဲတွင် သင် ထည့်သွင်းထားသော အပလီကေးရှင်းများမှတဆင့် ပြုလုပ်ထားသော အကောင့်များပါ ပါဝင်နိုင်ပါသည်။"</string>
<string name="permlab_authenticateAccounts" msgid="5265908481172736933">"အကောင့်များ ဖန်တီးရန်နှင့် စကားဝှက်များ ရွေးချယ်ရန်"</string>
- <string name="permdesc_authenticateAccounts" msgid="5472124296908977260">"appအား အကောင့် မန်နေဂျာ၏ အကောင့် စိစစ်ရေး လုပ်နိုင်စွမ်းများကို၊ အကောင့်များ ဖန်တီးခြင်း နှင့် ၎င်းတို့၏ စကားဝှက်များကို ရယူခြင်း နှင့် သတ်မှတ်ခြင်း အပါအဝင်ကို၊ အသုံးချခွင့် ပြုသည်။"</string>
+ <string name="permdesc_authenticateAccounts" msgid="5472124296908977260">"appအား အကောင့် မန်နေဂျာ၏ အကောင့် စိစစ်ရေး လုပ်နိုင်စွမ်းများကို၊ အကောင့်များ ဖန်တီးခြင်း နှင့် ၎င်းတို့၏ စကားဝှက်များကို ရယူခြင်း နှင့် သတ်မှတ်ခြင်း အပါအဝင်ကို၊ အသုံးချခွင့် ပြုသည်။"</string>
<string name="permlab_manageAccounts" msgid="4983126304757177305">"အကောင့်များအား ထည့် သို့ ထုတ်ပါ"</string>
- <string name="permdesc_manageAccounts" msgid="8698295625488292506">"appအား အကောင့်များ ထည့်ခြင်း နှင့် ဖယ်ရှားခြင်း နှင့် ၎င်းတို့၏ စကားဝှက်များကို ဖျက်ခြင်းလို လုပ်ရပ်များကို လုပ်ကိုင်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_manageAccounts" msgid="8698295625488292506">"appအား အကောင့်များ ထည့်ခြင်း နှင့် ဖယ်ရှားခြင်း နှင့် ၎င်းတို့၏ စကားဝှက်များကို ဖျက်ခြင်းလို လုပ်ရပ်များကို လုပ်ကိုင်ခွင့် ပြုသည်။"</string>
<string name="permlab_useCredentials" msgid="235481396163877642">"စက်ပေါ်ရှိ သုံးစွဲသူအကောင့်များ"</string>
- <string name="permdesc_useCredentials" msgid="7984227147403346422">"appအား အထောက်အထား စိစစ်ရေး တိုကင်များကို တောင်းဆိုခွင့် ပြုသည်။"</string>
+ <string name="permdesc_useCredentials" msgid="7984227147403346422">"appအား အထောက်အထား စိစစ်ရေး တိုကင်များကို တောင်းဆိုခွင့် ပြုသည်။"</string>
<string name="permlab_accessNetworkState" msgid="4951027964348974773">"ကွန်ရက် ချိတ်ဆက်မှုများအား ကြည့်ရန်"</string>
<string name="permdesc_accessNetworkState" msgid="8318964424675960975">"အပလီကေးရှင်းအား မည်သည့်ကွန်ရက်နက်ဝဘ်ရှိသလဲ၊ မည်သည့်ကွန်ရက်နှင့် ချိတ်ဆက်ထားလဲ စသည်ဖြင့် ကွန်ရက်ချိတ်ဆက်မှုများ၏ သတင်းအချက်အလက်များကို ကြည့်ခွင့်ပေးရန်"</string>
<string name="permlab_createNetworkSockets" msgid="8018758136404323658">"အပြည့်အ၀ ကွန်ရက်သုံးခွင့်ရရန်"</string>
<string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"အပလီကေးရှင်းအား ကွန်ရက်ဆော့ကတ်များ တည်ဆောက်ခွင့်၊ တသီးတသန့် ကွန်ရက် ပရိုတိုကောလ်များ သုံးခွင့် ပြုပါ။ အင်တာနက်မှ အချက်အလက်များ ပေးပို့ခြင်းကို ဘရောက်ဇာနှင့် တခြား အပလီကေးရှင်းများက လုပ်ဆောင်ပေးသောကြောင့် ဒီခွင့်ပြုချက်က အင်တာနက်မှ အချက်အလက် ပေးပို့ခြင်း မလိုအပ်ပါ"</string>
- <string name="permlab_writeApnSettings" msgid="505660159675751896">"ကွန်ယက်အပြင်အဆင်နှင့် အသွားအလာများကို ပြောင်းလဲ/ကြားဖြတ်စေခြင်း"</string>
- <string name="permdesc_writeApnSettings" msgid="5333798886412714193">"appအား ကွန်ရက် ဆက်တင်များကို ပြောင်းလဲလျက် ကွန်ရက် ဆက်သွယ်မှုများ အားလုံးကို ကြားဖြတ်ယူခြင်း နှင့် စုံစမ်းစစ်ဆေးခြင်း၊ ဥပမာ၊ မည်သည့် APN ၏ ပရော့က်စီ နှင့် ပို့တ်များကို ပြောင်းလဲခြင်း၊ ပြုလုပ်ခွင့် ပြုသည်။ ကြံဖန် appများက သင် မသိရဘဲနှင့် ကွန်ရက် အထုပ်များကို စောင့်ကြည့်ခြင်း၊ အခြားသို့ ညွှန်းပို့ခြင်း၊ သို့မဟုတ် မွမ်းမံခြင်းကို ပြုလုပ်နိုင်သည်။"</string>
+ <string name="permlab_writeApnSettings" msgid="505660159675751896">"ကွန်ယက်အပြင်အဆင်နှင့် အသွားအလာများကို ပြောင်းလဲ/ကြားဖြတ်စေခြင်း"</string>
+ <string name="permdesc_writeApnSettings" msgid="5333798886412714193">"appအား ကွန်ရက် ဆက်တင်များကို ပြောင်းလဲလျက် ကွန်ရက် ဆက်သွယ်မှုများ အားလုံးကို ကြားဖြတ်ယူခြင်း နှင့် စုံစမ်းစစ်ဆေးခြင်း၊ ဥပမာ၊ မည်သည့် APN ၏ ပရော့က်စီ နှင့် ပို့တ်များကို ပြောင်းလဲခြင်း၊ ပြုလုပ်ခွင့် ပြုသည်။ ကြံဖန် appများက သင် မသိရဘဲနှင့် ကွန်ရက် အထုပ်များကို စောင့်ကြည့်ခြင်း၊ အခြားသို့ ညွှန်းပို့ခြင်း၊ သို့မဟုတ် မွမ်းမံခြင်းကို ပြုလုပ်နိုင်သည်။"</string>
<string name="permlab_changeNetworkState" msgid="958884291454327309">"ကွန်ယက်ဆက်သွယ်မှုအားပြောင်းခြင်း"</string>
- <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"appအား ကွန်ရက် ချိတ်ဆက်နိုင်စွမ်း အခြေအနေကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
- <string name="permlab_changeTetherState" msgid="5952584964373017960">"တစ်ဆင့်ပွါးဆက်သွယ်မှုအားပြောင်းခြင်း"</string>
- <string name="permdesc_changeTetherState" msgid="1524441344412319780">"appအား ချိတ်တွဲထားသည့် ကွန်ရက် ချိတ်ဆက်နိုင်စွမ်း အခြေအနေကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"appအား ကွန်ရက် ချိတ်ဆက်နိုင်စွမ်း အခြေအနေကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permlab_changeTetherState" msgid="5952584964373017960">"တစ်ဆင့်ပွါးဆက်သွယ်မှုအားပြောင်းခြင်း"</string>
+ <string name="permdesc_changeTetherState" msgid="1524441344412319780">"appအား ချိတ်တွဲထားသည့် ကွန်ရက် ချိတ်ဆက်နိုင်စွမ်း အခြေအနေကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
<string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"နောက်ခံဒေတာအသုံးပြုခြင်းဆက်တင်အား ပြောင်းခြင်း"</string>
- <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"appအား နောက်ခံ ဒေတာ သုံးစွဲမှု ဆက်တင်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
+ <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"appအား နောက်ခံ ဒေတာ သုံးစွဲမှု ဆက်တင်ကို ပြောင်းလဲခွင့် ပြုသည်။"</string>
<string name="permlab_accessWifiState" msgid="5202012949247040011">"ဝိုင်ဖိုင် ချိတ်ဆက်မှများအား ကြည့်ရန်"</string>
<string name="permdesc_accessWifiState" msgid="5002798077387803726">"အပလီကေးရှင်းအား ဝိုင်ဖိုင် ဖွင့်ထား မထား၊ ချိတ်ဆက်ထားသော ပိုင်ဖိုင် စက်ပစ္စည်း စသဖြင့် ဝိုင်ဖိုင်နှင့် သက်ဆိုင်သော အချက်အလက် ကြည့်ခွင့်ပေးရန်"</string>
<string name="permlab_changeWifiState" msgid="6550641188749128035">"ဝိုင်ဖိုင်အား ချိတ်ဆက်ရန် နှင့် ဆက်သွယ်မှု ဖြတ်တောက်ရန်"</string>
<string name="permdesc_changeWifiState" msgid="7137950297386127533">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်တည်နေရာများအား ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်း၊ ဝိုင်ဖိုင်ကွန်ရက်အတွက် စက်အပြင်အဆင်များ ပြုလုပ်ခြင်း ခွင့်ပြုပါ"</string>
- <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Wi-Fi Multicastလက်ခံခြင်းကိုခွင့်ပြုရန်"</string>
+ <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Wi-Fi Multicastလက်ခံခြင်းကိုခွင့်ပြုရန်"</string>
<string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်ကွန်ရက်ပေါ်တွင် သင့်တက်ဘလက်တစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string>
<string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်နက်ဘ်ပေါ်တွင် သင့်ဖုန်းတစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string>
<string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ဘလူးတု ဆက်တင်များအား သုံးခွင့်ပေးရန်"</string>
- <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"appအား ဒေသန္တရ ဘလူးတုသ် တက်ဘလက်ကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
- <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"appအား ဒေသန္တရ ဘလူးတုသ် ဖုန်းကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
+ <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"appအား ဒေသန္တရ ဘလူးတုသ် တက်ဘလက်ကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
+ <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"appအား ဒေသန္တရ ဘလူးတုသ် ဖုန်းကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string>
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"အပလီကေးရှင်းသုံးပြီး ဘလူးတုသ်နှင့် ပူးတွဲချိတ်ဆက်ခြင်း အား ခွင့်ပြုရန်"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"အပလီကေးရှင်းကို အဝေးက စက်များနဲ့ ကိုင်ထားသူ မလုပ်ဆောင်ပဲ ပူးတွဲခွင့်ပေးခြင်း"</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"အပလီကေးရှင်းကို အဝေးက စက်များနဲ့ ကိုင်ထားသူ မလုပ်ဆောင်ပဲ ပူးတွဲခွင့်ပေးခြင်း"</string>
<string name="permlab_bluetoothMap" msgid="6372198338939197349">"ဘလူးတုသ် MAP ဒေတာကို ရယူသုံးရန်"</string>
- <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"appအား ဘလူးတုသ် MAP ဒေတာကို ရယူသုံးခွင့် ပြုသည်။"</string>
- <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"appအား ဘလူးတုသ် MAP ဒေတာကို ရယူသုံးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"appအား ဘလူးတုသ် MAP ဒေတာကို ရယူသုံးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"appအား ဘလူးတုသ် MAP ဒေတာကို ရယူသုံးခွင့် ပြုသည်။"</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"ဝိုင်မက်စ် နှင့် ချိတ်ဆက်ရန်နှင့် ဆက်သွယ်မှု ဖြတ်တောက်ရန်"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"အပလီကေးရှင်းအား ဝိုင်မက်စ် အခြေအနေ ကြည့်ခွင့်ပေးရန် ဥပမာ ဝိုင်မက်စ် ဖွင့်ထား မထား၊ ဝိုင်မက်စ် ချိတ်ဆက်ထားသော ကွန်ရက်အခြေအနေ"</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"ဝိုက်မက်စ် အခြေအနေအား ပြင်ရန်"</string>
<string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"အပလီကေးရှင်းအား တက်ဘလက်ကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string>
<string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"အပလီကေးရှင်းအား ဖုန်းကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string>
<string name="permlab_scoreNetworks" msgid="6445777779383587181">"ကွန်ရက်များကို အမှတ်ပေးခြင်း"</string>
- <string name="permdesc_scoreNetworks" product="tablet" msgid="1304304745850215556">"appအား ကွန်ရက်များကို အဆင့်အတန်း သတ်မှတ်ခွင့် ပြုကာ တက်ဘလက် အနေနှင့် မည်သည့် ကွန်ရက်ကို ပိုနှစ်ခြိုက်သင့်ကြောင်းကို ဆုံးဖြတ်စေနိုင်သည်။"</string>
- <string name="permdesc_scoreNetworks" product="default" msgid="1831501848178651379">"appအား ကွန်ရက်များကို အဆင့်အတန်း သတ်မှတ်ခွင့် ပြုကာ ဖုန်း အနေနှင့် မည်သည့် ကွန်ရက်ကို ပိုနှစ်ခြိုက်သင့်ကြောင်းကို ဆုံးဖြတ်စေနိုင်သည်။"</string>
+ <string name="permdesc_scoreNetworks" product="tablet" msgid="1304304745850215556">"appအား ကွန်ရက်များကို အဆင့်အတန်း သတ်မှတ်ခွင့် ပြုကာ တက်ဘလက် အနေနှင့် မည်သည့် ကွန်ရက်ကို ပိုနှစ်ခြိုက်သင့်ကြောင်းကို ဆုံးဖြတ်စေနိုင်သည်။"</string>
+ <string name="permdesc_scoreNetworks" product="default" msgid="1831501848178651379">"appအား ကွန်ရက်များကို အဆင့်အတန်း သတ်မှတ်ခွင့် ပြုကာ ဖုန်း အနေနှင့် မည်သည့် ကွန်ရက်ကို ပိုနှစ်ခြိုက်သင့်ကြောင်းကို ဆုံးဖြတ်စေနိုင်သည်။"</string>
<string name="permlab_bluetooth" msgid="6127769336339276828">"ဘလူးတု စက်များနှင့် အတူတွဲချိတ်ရန်"</string>
<string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"အပလီကေးရှင်းအား တက်ဘလက်ပေါ်မှ ဘလူးတုသ် အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string>
<string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"အပလီကေးရှင်းအား ဖုန်းမှဘလူးတု အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string>
<string name="permlab_nfc" msgid="4423351274757876953">"Near Field Communicationအား ထိန်းချုပ်ရန်"</string>
- <string name="permdesc_nfc" msgid="7120611819401789907">"appအား တာတို စက်ကွင်း ဆက်သွယ်ရေး (NFC) တဲဂ်များ၊ ကဒ်များ နှင့် ဖတ်ကြသူတို့နှင့် ဆက်သွယ်ပြောဆိုခွင့် ပြုသည်။"</string>
+ <string name="permdesc_nfc" msgid="7120611819401789907">"appအား တာတို စက်ကွင်း ဆက်သွယ်ရေး (NFC) တဲဂ်များ၊ ကဒ်များ နှင့် ဖတ်ကြသူတို့နှင့် ဆက်သွယ်ပြောဆိုခွင့် ပြုသည်။"</string>
<string name="permlab_disableKeyguard" msgid="3598496301486439258">"ဖန်သားပြင် သော့ချခြင်းအား မလုပ်နိုင်အောင် ပိတ်ရန်"</string>
<string name="permdesc_disableKeyguard" msgid="6034203065077122992">"အပလီကေးရှင်းအား သော့ချခြင်းနှင့် သက်ဆိုင်ရာ စကားဝှက်သတ်မှတ်ခြင်းများအား မသုံးနိုင်အောင် ပိတ်ခြင်းကို ခွင့်ပြုရန်။ ဥပမာ ဖုန်းလာလျှင် သော့ပိတ်ခြင်း ပယ်ဖျက်ခြင်း၊ ဖုန်းပြောပြီးလျှင် သော့ကို အလိုအလျောက် ပြန်ပိတ်ခြင်း"</string>
<string name="permlab_readSyncSettings" msgid="6201810008230503052">"ထပ်တူပြုအဆင်အပြင်အားဖတ်ခြင်း"</string>
@@ -688,40 +688,42 @@
<string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"အကောင့်တစ်ခုအတွက် ထပ်တူညီအောင်လုပ်သော ဆက်တင်များကို ပြင်ရန် အပလီကေးရှင်းကို ခွင့်ပြုရန်။ ဥပမာ People အပလီကေးရှင်း က အကောင့်တစ်ခုနှင့် ထပ်တူညီအောင် လုပ်ဆောင်ခြင်းအား ဖွင့်ရန် သုံးနိုင်သည်။"</string>
<string name="permlab_readSyncStats" msgid="7396577451360202448">"ထပ်တူကူးခြင်း ကိန်းဂဏန်းအချက်အလက်များကို ဖတ်ခြင်း"</string>
<string name="permdesc_readSyncStats" msgid="1510143761757606156">"အပလီကေးရှင်းအား အကောင့်တစ်ခု၏ ထပ်တူညီအောင် လုပ်ဆောင်မှု အခြေအနေ (ပြီးခဲ့သော အဖြစ်အပျက်၊ ဒေတာ ပမာဏ ပါဝင်မှု များအပါအဝင်)ကို ဖတ်ရှုခွင့် ပြုပါ။"</string>
- <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"အမည်သွင်းထားသောဖိဖ့်များကို ဖတ်ခြင်း"</string>
- <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"appအား လောလောဆယ် စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများ ဆိုင်ရာ အသေးစိတ်များကို ရယူခွင့်ပြုသည်။"</string>
- <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"အမည်သွင်းထားသောဖိဖ့်များကို ရေးခြင်း"</string>
- <string name="permdesc_subscribedFeedsWrite" msgid="6928930188826089413">"appအား လောလောဆယ် စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများကို ပြောင်းပစ်နိုင်သည်။"</string>
+ <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"အမည်သွင်းထားသောဖိဖ့်များကို ဖတ်ခြင်း"</string>
+ <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"appအား လောလောဆယ် စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများ ဆိုင်ရာ အသေးစိတ်များကို ရယူခွင့်ပြုသည်။"</string>
+ <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"အမည်သွင်းထားသောဖိဖ့်များကို ရေးခြင်း"</string>
+ <string name="permdesc_subscribedFeedsWrite" msgid="6928930188826089413">"appအား လောလောဆယ် စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက သင်၏ စင့်က် လုပ်ပြီးသား ထည့်သွင်းမှုများကို ပြောင်းပစ်နိုင်သည်။"</string>
<string name="permlab_readDictionary" msgid="4107101525746035718">"အဘိဓာန်သို့ သင့် ထည့်ထားသည်များအား ဖတ်ခြင်း"</string>
<string name="permdesc_readDictionary" msgid="659614600338904243">"အပလီကေးရှင်းအား အဘိဓာန်တွင် သိမ်းဆည်းထားသော စာလုံးအားလုံး၊ နာမည်များနှင့် စာစုများ ဖတ်ရှုခွင့် ပြုရန်"</string>
<string name="permlab_writeDictionary" msgid="2183110402314441106">"သုံးစွဲသူ၏ အဘိဓာန် ထဲသို့ စာလုံးများ ထည့်ခြင်း"</string>
- <string name="permdesc_writeDictionary" msgid="8185385716255065291">"အသုံးပြုသူ အဘိဓာန်ထဲသို့ စာလုံး အသစ်များကို ရေးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_writeDictionary" msgid="8185385716255065291">"အသုံးပြုသူ အဘိဓာန်ထဲသို့ စာလုံး အသစ်များကို ရေးခွင့် ပြုသည်။"</string>
<string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"USB သိုလှောင်မှုမှ အချက်အလက်များအား ဖတ်ခြင်း"</string>
<string name="permlab_sdcardRead" product="default" msgid="2188156462934977940">"SD ကဒ်မှ အချက်အလက်များအား ဖတ်ခြင်း"</string>
<string name="permdesc_sdcardRead" product="nosdcard" msgid="3446988712598386079">"အပလီကေးရှင်းအား USB သိုလှောင်မှုပေါ်မှ ဒေတာများ ဖတ်ရှုခွင့်ပြုခြင်း"</string>
<string name="permdesc_sdcardRead" product="default" msgid="2607362473654975411">"အပလီကေးရှင်းအား အက်စ်ဒီ ကဒ်ပေါ်မှ ဒေတာများ ဖတ်ရှုခွင့်ပြုခြင်း"</string>
<string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USBမှဒေတာအား ပြင် သို့ ဖျက်ရန်"</string>
<string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD ကဒ်ပေါ်မှ အချက်အလက်များအား ပြင်ဆင်ခြင်း သို့ ဖျက်ပစ်ခြင်း"</string>
- <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6175406299445710888">"appအား USB သိုလှောင်ခန်းသို့ ရေးခွင့် ပြုသည်။"</string>
- <string name="permdesc_sdcardWrite" product="default" msgid="4337417790936632090">"appအား SD ကဒ်သို့ ရေးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6175406299445710888">"appအား USB သိုလှောင်ခန်းသို့ ရေးခွင့် ပြုသည်။"</string>
+ <string name="permdesc_sdcardWrite" product="default" msgid="4337417790936632090">"appအား SD ကဒ်သို့ ရေးခွင့် ပြုသည်။"</string>
<string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"စက်တွင်းမီဒီယာသိမ်းဆည်းမှုအကြောင်းအရာများကို မွမ်းမံ/ပယ်ဖျက်ရန်"</string>
- <string name="permdesc_mediaStorageWrite" product="default" msgid="8189160597698529185">"appအား အတွင်းပိုင်း မီဒီယာ သိုလှော်ခန်း အကြေင်းအရာများကို မွမ်းမံခွင့် ပြုသည်။"</string>
+ <string name="permdesc_mediaStorageWrite" product="default" msgid="8189160597698529185">"appအား အတွင်းပိုင်း မီဒီယာ သိုလှော်ခန်း အကြေင်းအရာများကို မွမ်းမံခွင့် ပြုသည်။"</string>
<string name="permlab_manageDocs" product="default" msgid="5778318598448849829">"စာရွက်စာတန်းများ သိုလှောင်မှုကို ထိန်းသိမ်းခြင်း"</string>
<string name="permdesc_manageDocs" product="default" msgid="8704323176914121484">"အပလီကေးရှင်းအား စာရွက်စာတမ်းများအား ထိန်းချုပ်ခွင့်ပေးခြင်း"</string>
<string name="permlab_sdcardAccessAll" msgid="8150613823900460576">"အသုံးပြုသူ အားလုံး၏ ပြင်ပသိုလှောင်ရာအား အသုံးပြုရန်"</string>
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"အပလီကေးရှင်းအား သုံးစွဲသူ အားလုံးအတွက် ပြင်ပသိမ်းဆည်မှုအား သုံးခွင့် ပြုပါ။"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"cache ဖိုင်စနစ်အား ဝင်ရောက်ချိတ်ဆက်ခြင်း"</string>
- <string name="permdesc_cache_filesystem" msgid="5578967642265550955">"appအား ဖိုင်စနစ်၏ကက်ရှကို ဖတ် နှင့် ရေး ခွင့်ပြုသည်။"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permdesc_cache_filesystem" msgid="5578967642265550955">"appအား ဖိုင်စနစ်၏ကက်ရှကို ဖတ် နှင့် ရေး ခွင့်ပြုသည်။"</string>
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP ခေါ်ဆိုမှုများ ခေါ်ရန်/လက်ခံရန်"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ခေါ်ဆိုမှုများ ခေါ်ရန်နှင့် လက်ခံနိုင်ရန် app ကို ခွင့်ပြုပါ။"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"တခါတည်း ခေါ်ဆိုနိုင်သော ဖန်သားပြင်နဲ့ ဆက်ဆံရန်"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ဖုန်းကိုင်သူ ဘယ်အချိန် ဘယ်လိုမှာ အပလီကေးရှင်းအတွင်း ဖုန်းခေါ်မှုကို မြင်ရခြင်းအား ထိန်းချုပ်ခွင့်ပေးခြင်း"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ရာဇဝင်အလိုက် ကွန်ယက်သုံစွဲမှုအား ဖတ်ခြင်း"</string>
- <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"appအား အထူး ကွန်ရက်များ နှင့် appများ အတွက် ကွန်ရက် အသုံးပြုမှု မှတ်တမ်းကို ဖတ်ကြားခွင့် ပြုသည်။"</string>
+ <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"appအား အထူး ကွန်ရက်များ နှင့် appများ အတွက် ကွန်ရက် အသုံးပြုမှု မှတ်တမ်းကို ဖတ်ကြားခွင့် ပြုသည်။"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ကွန်ယက်မူဝါဒအား စီမံခြင်း"</string>
- <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"appအား ကွန်ရက် မူဝါဒများကို စီမံခန့်ခွဲခွင့် နှင့် app-ဆိုင်ရာ စည်းကမ်းချက်များကို ပြဌာန်းခွင့် ပြုသည်။"</string>
+ <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"appအား ကွန်ရက် မူဝါဒများကို စီမံခန့်ခွဲခွင့် နှင့် app-ဆိုင်ရာ စည်းကမ်းချက်များကို ပြဌာန်းခွင့် ပြုသည်။"</string>
<string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"ကွန်ယက်အသုံးပြုမှုစာရင်းအား မွမ်းမံခြင်း"</string>
<string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"အပလီကေးရှင်းအား တခြားအပလီကေးရှင်းများမှ ကွန်ရက်အသုံးပြုမှု တွက်ချက်ခြင်းအား ပြင်ဆင်ခွင့် ပြုပါ။ ပုံမှန် အပလီကေးရှင်းများအတွက် မလိုအပ်ပါ။"</string>
<string name="permlab_accessNotifications" msgid="7673416487873432268">"သတိပေးချက်များအား အသုံးပြုခွင့်"</string>
@@ -729,37 +731,37 @@
<string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"သတိပေးချက် နားထောင်ခြင်း ဆားဗစ် နှင့် ပူးပေါင်းခြင်း"</string>
<string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"ဖုန်းကိုင်ထားသူနှင့် အကြောင်းကြားချက် နားစွင့်သော ဆားဗစ်မှ ထိပ်ပိုင်းအင်တာဖေ့စ် ကို ပူးပေါင်းခွင့်ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုအပ်ပါ"</string>
<string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"အခြေအနေ စီမံပေးရေး ဝန်ဆောင်မှု တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
- <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"စွဲကိုင်ထားသူအား အခြေအနေကို စီမံပေးသူ၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"စွဲကိုင်ထားသူအား အခြေအနေကို စီမံပေးသူ၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ ချိတ်တွဲခွင့်ကို ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindMediaRouteService" msgid="6637740382272686835">"မီဒီယာ လမ်းကြောင်း ဝန်ဆောင်မှုသို့ တွဲချည်ရန်"</string>
- <string name="permdesc_bindMediaRouteService" msgid="6436655024972496687">"ကိုင်ထားသူအား မီဒီယာ လမ်းကြောင်း ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ တွဲချည်ခွင့် ပြုသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_bindMediaRouteService" msgid="6436655024972496687">"ကိုင်ထားသူအား မီဒီယာ လမ်းကြောင်း ဝန်ဆောင်မှု၏ ထိပ်သီး အဆင့် အင်တာဖေ့စ်သို့ တွဲချည်ခွင့် ပြုသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_bindDreamService" msgid="4153646965978563462">"အိပ်မက် ဝန်ဆောင်မှုသို့ ပေါင်းစည်းမည်"</string>
<string name="permdesc_bindDreamService" msgid="7325825272223347863">"အိမ်မက်ဝန်ဆောင်မှု၏ ထိပ်တန်းအဆင့် မျက်နှာပြင်အား ကိုင်ဆောင်သူမှ ပေါင်းစည်းရန် ခွင့်ပြုမည်။ သာမန် အပလီကေးရှင်းများတွင် မလိုအပ်ပါ။"</string>
<string name="permlab_invokeCarrierSetup" msgid="3699600833975117478">"မိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာန မှ ထည့်သွင်းပေးသော အခြေအနေများအား ပယ်ဖျက်ခြင်း"</string>
<string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"ကိုင်ဆောင်သူအားမိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာနမှ ထည့်သွင်းထားတဲ့ အပြင်အဆင်အား ပယ်ဖျက်ခွင့် ပေးခြင်း။ ပုံမှန် အပလီကေးရှင်းများမှာ မလိုပါ"</string>
<string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"ကွန်ယက်အခြေအနေအား လေ့လာနေမှုအား နားထောင်ခွင့်"</string>
<string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"အပလီကေးရှင်းကို နက်ဝေါ့ ပေါ်က အခြေအနေကို သတိထားခွင့် ပေးခြင်း၊. ပုံမှန် အပလီကေးရှင်း များတွင် မလိုအပ်ပါ"</string>
- <string name="permlab_setInputCalibration" msgid="4902620118878467615">"change ထည့်သွင်းရေး ကိရိယာ တိုင်းထွာညှိနှိုင်းမှု ပြောင်းလဲခြင်း"</string>
- <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"appအား တို့ထိရေး မျက်နှာပြင် တိုင်းထွာစံညှိမှုကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permlab_setInputCalibration" msgid="4902620118878467615">"change ထည့်သွင်းရေး ကိရိယာ တိုင်းထွာညှိနှိုင်းမှု ပြောင်းလဲခြင်း"</string>
+ <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"appအား တို့ထိရေး မျက်နှာပြင် တိုင်းထွာစံညှိမှုကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"DRM လက်မှတ်များကို ရယူသုံးခြင်း"</string>
- <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"အပလီကေးရှင်း တစ်ခုအား စီမံလုပ်ကိုင်ခွင့် DRM လက်မှတ်များ သုံးခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"အပလီကေးရှင်း တစ်ခုအား စီမံလုပ်ကိုင်ခွင့် DRM လက်မှတ်များ သုံးခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_handoverStatus" msgid="1159132046126626731">"အန်ဒရွိုက်၏ အလင်းတန်းထိုး လွှဲပြောင်းမှု အခြေအနေကို ရယူရန်"</string>
- <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ဒီအပလီကေးရှင်းအား အန်ဒရွိုက်၏ လက်ရှိ အလင်းတန်းထိုး လွှဲပြောင်းမှု အကြောင်း အချက်အလက်ကို ရယူခွင့် ပြုသည်"</string>
+ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ဒီအပလီကေးရှင်းအား အန်ဒရွိုက်၏ လက်ရှိ အလင်းတန်းထိုး လွှဲပြောင်းမှု အကြောင်း အချက်အလက်ကို ရယူခွင့် ပြုသည်"</string>
<string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM လက်မှတ်များ ဖယ်ရှားရန်"</string>
- <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"အပလီကေးရှင်းအား DRM လက်မှတ်များကို ဖယ်ရှားခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"အပလီကေးရှင်းအား DRM လက်မှတ်များကို ဖယ်ရှားခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="policylab_limitPassword" msgid="4497420728857585791">"စကားဝှက်စည်းမျဥ်းကိုသတ်မှတ်ရန်"</string>
<string name="policydesc_limitPassword" msgid="3252114203919510394">"မျက်နှာပြင် သော့ဖွင့်ရန် လိုအပ်သော စကားလုံးအရေအတွက်နှင့် အမျိုးအစားအား ထိန်းချုပ်ရန်"</string>
- <string name="policylab_watchLogin" msgid="914130646942199503">"မော်နီတာမျက်နှာပြင်ဖွင့်ရန် ကြိုးစားခွင့်များ"</string>
- <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် တက်ဘလက်ကို သော့ခတ်ရန် သို့မဟုတ် တက်ဘလက် ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
- <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် ဖုန်းကို သော့ခတ်ရန် သို့မဟုတ် ဖုန်း ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
- <string name="policylab_resetPassword" msgid="2620077191242688955">"မျက်နှာပြင်ဖွင့်ရန်စကားဝှက်အား ပြောင်းခြင်း"</string>
- <string name="policydesc_resetPassword" msgid="605963962301904458">"မျက်နှာပြင်ဖွင့်ရန်စကားဝှက်အား ပြောင်းခြင်း"</string>
+ <string name="policylab_watchLogin" msgid="914130646942199503">"မော်နီတာမျက်နှာပြင်ဖွင့်ရန် ကြိုးစားခွင့်များ"</string>
+ <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် တက်ဘလက်ကို သော့ခတ်ရန် သို့မဟုတ် တက်ဘလက် ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
+ <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"မျက်နှာပြင်ကို သော့ဖွင့်ရန် အတွက် စကားဝှက် မမှန်မကန် ထည့်သွင်းမှု အရေအတွက်ကို စောင့်ကြည့်လျက်၊ စကားဝှက် ရိုက်ထည့်မှု သိပ်များနေလျှင် ဖုန်းကို သော့ခတ်ရန် သို့မဟုတ် ဖုန်း ဒေတာ အားလုံးကို ဖျက်ပစ်ရန်။"</string>
+ <string name="policylab_resetPassword" msgid="2620077191242688955">"မျက်နှာပြင်ဖွင့်ရန်စကားဝှက်အား ပြောင်းခြင်း"</string>
+ <string name="policydesc_resetPassword" msgid="605963962301904458">"မျက်နှာပြင်ဖွင့်ရန်စကားဝှက်အား ပြောင်းခြင်း"</string>
<string name="policylab_forceLock" msgid="2274085384704248431">"မျက်နှာပြင်အားသော့ချရန်"</string>
<string name="policydesc_forceLock" msgid="1141797588403827138">"မည်သည့်အချိန်တွင် ဖန်သားပြင်အား မည်ကဲ့သို့နည်းဖြင် သော့ချရန် ထိန်းချုပ်ခြင်း"</string>
<string name="policylab_wipeData" msgid="3910545446758639713">"ဒေတာအားလုံးအားဖျက်ခြင်း"</string>
<string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"စက်ရုံထုတ် အခြေအနေအား ပြန်ပြောင်းခြင်းဖြင့် တက်ဘလက်ရှိ အချက်အလက်များအား ကြိုတင်သတိပေးမှုမရှိပဲ ဖျက်စီးရန်"</string>
<string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"စက်ရုံထုတ် အခြေအနေအား ပြန်ပြောင်းခြင်းဖြင့် ဖုန်းရှိ အချက်အလက်များအား ကြိုတင်သတိပေးမှုမရှိပဲ ဖျက်စီးရန်"</string>
<string name="policylab_setGlobalProxy" msgid="2784828293747791446">"တကမာ္ဘလုံးဆိုင်ရာပရော်စီကို သတ်မှတ်ခြင်း"</string>
- <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"မူဝါဒအသုံးပြုခွင့်ရလျှင် စက်ပစ္စည်းတကမ္ဘာလုံးဆိုင်ရာပရော်စီအားသုံးရန် သတ်မှတ်ခြင်း။ ပထမဦးဆုံးသောစက်၏ထိန်းချုပ်သူသာ တကမ္ဘာလုံးဆိုင်ရာပရော်စီသာအားအကျိုးသက်ရောက်စေရန် သတ်မှတ်နိုင်သည်။"</string>
+ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"မူဝါဒအသုံးပြုခွင့်ရလျှင် စက်ပစ္စည်းတကမ္ဘာလုံးဆိုင်ရာပရော်စီအားသုံးရန် သတ်မှတ်ခြင်း။ ပထမဦးဆုံးသောစက်၏ထိန်းချုပ်သူသာ တကမ္ဘာလုံးဆိုင်ရာပရော်စီသာအားအကျိုးသက်ရောက်စေရန် သတ်မှတ်နိုင်သည်။"</string>
<string name="policylab_expirePassword" msgid="885279151847254056">"စကားဝှက်သက်တမ်းသတ်မှတ်ရန်"</string>
<string name="policydesc_expirePassword" msgid="1729725226314691591">"ဖန်သားပြင်သော့ချခြင်း စကားဝှက် ပြင်ဆင်ခွင့် အကြိမ်ရေအား ထိန်းချုပ်ခြင်း"</string>
<string name="policylab_encryptedStorage" msgid="8901326199909132915">"သိုလှောင်လျို့ဝှက်ခြင်းသတ်မှတ်"</string>
@@ -882,21 +884,21 @@
<string name="sipAddressTypeWork" msgid="6920725730797099047">"အလုပ်အကိုင်"</string>
<string name="sipAddressTypeOther" msgid="4408436162950119849">"တခြား"</string>
<string name="quick_contacts_not_available" msgid="746098007828579688">"ဒီအဆက်အသွယ်အား ကြည့်ရှုရန် အပလီကေးရှင်း မတွေ့ပါ"</string>
- <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN ကုဒ် ရိုက်ထည့်ပါ"</string>
- <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"PUK နှင့် PIN ကုဒ် အသစ်ကို ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN ကုဒ် ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"PUK နှင့် PIN ကုဒ် အသစ်ကို ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK နံပါတ်"</string>
<string name="keyguard_password_enter_pin_prompt" msgid="8027680321614196258">"PIN ကုဒ် အသစ်"</string>
<string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"စကားဝှက် ရိုက်ရန် ထိပါ"</font></string>
- <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"သော့ဖွင့်ရန် စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
- <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"သော့ဖွင့်ရန် PIN ကို ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"သော့ဖွင့်ရန် စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"သော့ဖွင့်ရန် PIN ကို ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"ပင်နံပါတ်မှားနေပါသည်"</string>
- <string name="keyguard_label_text" msgid="861796461028298424">"သော့ဖွင့်ရန် Menu ထိုနောက်0ကိုနှိပ်ပါ"</string>
+ <string name="keyguard_label_text" msgid="861796461028298424">"သော့ဖွင့်ရန် Menu ထိုနောက်0ကိုနှိပ်ပါ"</string>
<string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"အရေးပေါ်နံပါတ်"</string>
<string name="lockscreen_carrier_default" msgid="8963839242565653192">"ဆားဗစ် မရှိပါ"</string>
<string name="lockscreen_screen_locked" msgid="7288443074806832904">"မျက်နှာပြင်အားသော့ချထားသည်"</string>
- <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"ဖွင့်ရန်သို့မဟုတ်အရေးပေါ်ခေါ်ဆိုခြင်းပြုလုပ်ရန် မီနူးကိုနှိပ်ပါ"</string>
+ <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"ဖွင့်ရန်သို့မဟုတ်အရေးပေါ်ခေါ်ဆိုခြင်းပြုလုပ်ရန် မီနူးကိုနှိပ်ပါ"</string>
<string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"မီးနူးကို နှိပ်ခြင်းဖြင့် သော့ဖွင့်ပါ"</string>
- <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"ဖွင့်ရန်ပုံစံဆွဲပါ"</string>
+ <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"ဖွင့်ရန်ပုံစံဆွဲပါ"</string>
<string name="lockscreen_emergency_call" msgid="5347633784401285225">"အရေးပေါ်ခေါ်ဆိုရန်"</string>
<string name="lockscreen_return_to_call" msgid="5244259785500040021">"ခေါ်ဆိုမှုထံပြန်သွားရန်"</string>
<string name="lockscreen_pattern_correct" msgid="9039008650362261237">"မှန်ပါသည်"</string>
@@ -910,10 +912,10 @@
<string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ဆင်းကဒ် မရှိပါ"</string>
<string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"တက်ပလက်ထဲတွင်း ဆင်းကဒ် မရှိပါ"</string>
<string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"ဖုန်းထဲတွင် ဆင်းကဒ် မရှိပါ"</string>
- <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"ဆင်းမ် ကဒ်ကို ထည့်သွင်းပါ။"</string>
+ <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"ဆင်းမ်ကဒ် ထည့်ပါ"</string>
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"ဆင်းမ်ကဒ် မရှိဘူး သို့မဟုတ် ဖတ်မရပါ။ ဆင်းမ်ကဒ် တစ်ခုကို ထည့်ပါ။"</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"သုံးစွဲ မရတော့သော ဆင်းကဒ်"</string>
- <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"သင့် ဆင်းမ်ကဒ်ကို ထာဝရ ပိတ်လိုက်ပါပြီ။\n နောက် ဆင်းမ်ကဒ် တစ်ခု အတွက် သင်၏ ကြိုးမဲ့ ဝန်ဆောင်မှု စီမံပေးသူကို ဆက်သွယ်ပါ"</string>
+ <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"သင့် ဆင်းမ်ကဒ်ကို ထာဝရ ပိတ်လိုက်ပါပြီ။\n နောက် ဆင်းမ်ကဒ် တစ်ခု အတွက် သင်၏ ကြိုးမဲ့ ဝန်ဆောင်မှု စီမံပေးသူကို ဆက်သွယ်ပါ"</string>
<string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"ယခင် တစ်ပုဒ်"</string>
<string name="lockscreen_transport_next_description" msgid="573285210424377338">"နောက် တစ်ပုဒ်"</string>
<string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"ခဏရပ်ရန်"</string>
@@ -924,21 +926,21 @@
<string name="emergency_calls_only" msgid="6733978304386365407">"အရေးပေါ်ခေါ်ဆိုမှုသာ"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"ကွန်ယက် သော့ကျနေခြင်း"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"ဆင်းမ်ကဒ် ရဲ့ ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် သော့ကျနေပါသည်"</string>
- <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"သုံးစွဲသူ လမ်းညွှန်ကို ကြည့်ပါ သို့မဟုတ် ဖောက်သည်များ စောင့်ရှောက်ရေး ဌာနကို ဆက်သွယ်ပါ။"</string>
+ <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"သုံးစွဲသူ လမ်းညွှန်ကို ကြည့်ပါ သို့မဟုတ် ဖောက်သည်များ စောင့်ရှောက်ရေး ဌာနကို ဆက်သွယ်ပါ။"</string>
<string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"ဆင်းမ်ကဒ် သော့ကျနေပါသည်"</string>
<string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"ဆင်းမ်ကဒ် ကို သော့ဖွင့်နေပါသည်"</string>
- <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"သင်သည် သော့ဖွင့် ပုံစံကို<xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ \n\nထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g>စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
- <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"သင်သည် စကားဝှက်ကို <xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရိုက်ခဲ့ပြီ။ \n\n ထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g> စက္ကန့်အကြာ စမ်းကြည့်ပါ။"</string>
- <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"သင်သည် သင်၏ PIN <xliff:g id="NUMBER_0">%d</xliff:g>ကို ကြိမ် မမှန်မကန် ရိုက်ခဲ့ပြီ။ \n\n ထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g> စက္ကန့်အကြာ စမ်းကြည့်ပါ။"</string>
- <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"သင်သည် သော့ဖွင့် ပုံစံကို<xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ နောက်ထပ် <xliff:g id="NUMBER_1">%d</xliff:g> မအောင်မြင်သည့် ကြိုးပမ်းမှု နောက်မှာ၊ သင်၏ တက်ဘလက်ကို Google လက်မှတ်ထိုး ဝင်မှုဖြင့် ဖွင့်ရန် တောင်းဆိုခံရမည်။ \n\n ထပ်ပြီး <xliff:g id="NUMBER_2">%d</xliff:g> စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
- <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"သင်သည် သော့ဖွင့် ပုံစံကို <xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ နောက်ထပ် <xliff:g id="NUMBER_1">%d</xliff:g> မအောင်မြင်သည့် ကြိုးပမ်းမှု နောက်မှာ၊ သင်၏ ဖုန်းကို Google လက်မှတ်ထိုး ဝင်မှုဖြင့် ဖွင့်ရန် တောင်းဆိုခံရမည်။ \n\n ထပ်ပြီး <xliff:g id="NUMBER_2">%d</xliff:g> စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
- <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"သင့်Tabletအား မှားယွင်းစွာ <xliff:g id="NUMBER_0">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားနေပါသည်။ နောက်ထပ်<xliff:g id="NUMBER_1">%d</xliff:g>ကြိမ်မအောင်မြင်ပါက မူလစက်ရုံ အနေအထားသို့ပြန်လည်ရောက်ရှိကာ အသုံးပြုသူ၏ဒေတာအားလုံးဆုံးရှုံးပါမည်။"</string>
- <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"သင့်ဖုန်းအား မှားယွင်းစွာ <xliff:g id="NUMBER_0">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားနေပါသည်။ နောက်ထပ်<xliff:g id="NUMBER_1">%d</xliff:g>ကြိမ်မအောင်မြင်ပါက မူလစက်ရုံ အနေအထားသို့ပြန်လည်ရောက်ရှိကာ အသုံးပြုသူ၏ဒေတာအားလုံးဆုံးရှုံးပါမည်။"</string>
- <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"သင့်Tabletအား မှားယွင်းစွာ <xliff:g id="NUMBER">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားခဲ့ပါသည်။ယခုဖုန်းကိုမူလစက်ရုံအနေအထားသို့ပြန်လည်ရောက်ရှိပါမည်။"</string>
- <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"သင့်ဖုန်းအား မှားယွင်းစွာ <xliff:g id="NUMBER">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားခဲ့ပါသည်။ ယခုဖုန်းကို မူလစက်ရုံအနေအထားသို့ပြန်လည်ရောက်ရှိပါမည်။"</string>
- <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"<xliff:g id="NUMBER">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်ကြိုးစားပါ"</string>
+ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"သင်သည် သော့ဖွင့် ပုံစံကို<xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ \n\nထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g>စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
+ <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"သင်သည် စကားဝှက်ကို <xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရိုက်ခဲ့ပြီ။ \n\n ထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g> စက္ကန့်အကြာ စမ်းကြည့်ပါ။"</string>
+ <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"သင်သည် သင်၏ PIN <xliff:g id="NUMBER_0">%d</xliff:g>ကို ကြိမ် မမှန်မကန် ရိုက်ခဲ့ပြီ။ \n\n ထပ်ပြီးတော့ <xliff:g id="NUMBER_1">%d</xliff:g> စက္ကန့်အကြာ စမ်းကြည့်ပါ။"</string>
+ <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"သင်သည် သော့ဖွင့် ပုံစံကို<xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ နောက်ထပ် <xliff:g id="NUMBER_1">%d</xliff:g> မအောင်မြင်သည့် ကြိုးပမ်းမှု နောက်မှာ၊ သင်၏ တက်ဘလက်ကို Google လက်မှတ်ထိုး ဝင်မှုဖြင့် ဖွင့်ရန် တောင်းဆိုခံရမည်။ \n\n ထပ်ပြီး <xliff:g id="NUMBER_2">%d</xliff:g> စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
+ <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"သင်သည် သော့ဖွင့် ပုံစံကို <xliff:g id="NUMBER_0">%d</xliff:g> ကြိမ် မမှန်မကန် ရေးဆွဲခဲ့သည်။ နောက်ထပ် <xliff:g id="NUMBER_1">%d</xliff:g> မအောင်မြင်သည့် ကြိုးပမ်းမှု နောက်မှာ၊ သင်၏ ဖုန်းကို Google လက်မှတ်ထိုး ဝင်မှုဖြင့် ဖွင့်ရန် တောင်းဆိုခံရမည်။ \n\n ထပ်ပြီး <xliff:g id="NUMBER_2">%d</xliff:g> စက္ကန့် အကြာမှာ စမ်းကြည့်ပါ။"</string>
+ <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"သင့်Tabletအား မှားယွင်းစွာ <xliff:g id="NUMBER_0">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားနေပါသည်။ နောက်ထပ်<xliff:g id="NUMBER_1">%d</xliff:g>ကြိမ်မအောင်မြင်ပါက မူလစက်ရုံ အနေအထားသို့ပြန်လည်ရောက်ရှိကာ အသုံးပြုသူ၏ဒေတာအားလုံးဆုံးရှုံးပါမည်။"</string>
+ <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"သင့်ဖုန်းအား မှားယွင်းစွာ <xliff:g id="NUMBER_0">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားနေပါသည်။ နောက်ထပ်<xliff:g id="NUMBER_1">%d</xliff:g>ကြိမ်မအောင်မြင်ပါက မူလစက်ရုံ အနေအထားသို့ပြန်လည်ရောက်ရှိကာ အသုံးပြုသူ၏ဒေတာအားလုံးဆုံးရှုံးပါမည်။"</string>
+ <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"သင့်Tabletအား မှားယွင်းစွာ <xliff:g id="NUMBER">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားခဲ့ပါသည်။ယခုဖုန်းကိုမူလစက်ရုံအနေအထားသို့ပြန်လည်ရောက်ရှိပါမည်။"</string>
+ <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"သင့်ဖုန်းအား မှားယွင်းစွာ <xliff:g id="NUMBER">%d</xliff:g>ကြိမ်ဖွင့်ရန် ကြိုးစားခဲ့ပါသည်။ ယခုဖုန်းကို မူလစက်ရုံအနေအထားသို့ပြန်လည်ရောက်ရှိပါမည်။"</string>
+ <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"<xliff:g id="NUMBER">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်ကြိုးစားပါ"</string>
<string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"ပုံစံအားမေ့နေပါသလား"</string>
- <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"အကောင့်ဖွင့်ရန်"</string>
+ <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"အကောင့်ဖွင့်ရန်"</string>
<string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"အကြိမ်ရေ များစွာ ပုံဆွဲသော့ဖွင့်ရန် ကြိုးစားခြင်း"</string>
<string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"သော့ဖွင့်ရန် ဂူဂဲလ် အကောင့်ဖြင့် ဝင်ပါ"</string>
<string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"သုံးစွဲသူ အမှတ် (အီးမေးလ်)"</string>
@@ -948,7 +950,7 @@
<string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"သုံးစွဲသူ အမည် သို့ စကားဝှင်ကို မေ့နေပါသလား။ \n"<b>"google.com/accounts/recovery"</b>" ကို သွားရောက်ပါ။"</string>
<string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"စစ်ဆေးနေပါသည်…"</string>
<string name="lockscreen_unlock_label" msgid="737440483220667054">"ဆင်းမ်ကဒ် ဖွင့်ပါ"</string>
- <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"အသံဖွင့်ထားသည်"</string>
+ <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"အသံဖွင့်ထားသည်"</string>
<string name="lockscreen_sound_off_label" msgid="996822825154319026">"အသံပိတ်ထားသည်"</string>
<string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"ပုံစံစတင်ခြင်း"</string>
<string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"ပုံစံရှင်းလင်းခြင်း"</string>
@@ -985,9 +987,9 @@
<string name="hour_ampm" msgid="4584338083529355982">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string>
<string name="hour_cap_ampm" msgid="2083465992940444366">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string>
<string name="factorytest_failed" msgid="5410270329114212041">"စက်ရုံစမ်းသပ်ခြင်းမအောင်မြင်ပါ"</string>
- <string name="factorytest_not_system" msgid="4435201656767276723">"စက်ရုံစမ်းသပ်မှုမှာ စနစ်/အပ်ပလီကေးရှင်း ထည့်သွင်းထားသောpackageများကိုသာ ပံ့ပိုးမှုပေးသည်။."</string>
- <string name="factorytest_no_action" msgid="872991874799998561">"စက်ရုံစမ်းသပ်မှုအားလုပ်ဆောင်ရန် မည်သည့်packageမှ မတွေ့ပါ။"</string>
- <string name="factorytest_reboot" msgid="6320168203050791643">"လုပ်ငန်းစနစ်ထည့်သွင်းပြီး ပြန်လည်စတင်ရန်"</string>
+ <string name="factorytest_not_system" msgid="4435201656767276723">"စက်ရုံစမ်းသပ်မှုမှာ စနစ်/အပ်ပလီကေးရှင်း ထည့်သွင်းထားသောpackageများကိုသာ ပံ့ပိုးမှုပေးသည်။."</string>
+ <string name="factorytest_no_action" msgid="872991874799998561">"စက်ရုံစမ်းသပ်မှုအားလုပ်ဆောင်ရန် မည်သည့်packageမှ မတွေ့ပါ။"</string>
+ <string name="factorytest_reboot" msgid="6320168203050791643">"လုပ်ငန်းစနစ်ထည့်သွင်းပြီး ပြန်လည်စတင်ရန်"</string>
<string name="js_dialog_title" msgid="1987483977834603872">"ဒီ \"<xliff:g id="TITLE">%s</xliff:g>\" က စာမျက်နှာက ပြောဆိုတာက:"</string>
<string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string>
<string name="js_dialog_before_unload_title" msgid="2619376555525116593">"သေချာကြောင်း လုပ်ပါ"</string>
@@ -1020,21 +1022,21 @@
<string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"အပလီကေးရှင်းအား ဘရောင်ဇာမှ မှတ်တမ်း သို့ မှတ်သားမှု အမှတ်များအား ပြင်ဆင်ခွင့် ပေးခြင်း။ အပလီကေးရှင်းမှ ဘရောင်ဇာ မှတ်တမ်းများကို ဖျက်ပစ်ခွင့် သို့ ပြင်ဆင်ခွင့် ရှိပါမည်။ မှတ်ချက်။ ဤခွင့်ပြုချက်ကို တတိယပါတီ ဘရောင်ဇာများ၊ တခြား အပလီကေးရှင်းများမှ သုံးမည် မဟုတ်ပါ။"</string>
<string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"အပလီကေးရှင်းအား ဘရောင်ဇာမှ မှတ်တမ်း သို့ မှတ်သားမှု အမှတ်များအား ပြင်ဆင်ခွင့် ပေးခြင်း။ အပလီကေးရှင်းမှ ဘရောင်ဇာ မှတ်တမ်းများကို ဖျက်ပစ်ခွင့် သို့ ပြင်ဆင်ခွင့် ရှိပါမည်။ မှတ်ချက်။ ဒီခွင့်ပြုချက်ကို တတိယပါတီ ဘရောင်ဇာများ၊ တခြား အပလီကေးရှင်းများမှ သုံးမည် မဟုတ်ပါ။"</string>
<string name="permlab_setAlarm" msgid="1379294556362091814">"နှိုးစက်သတ်မှတ်ရန်"</string>
- <string name="permdesc_setAlarm" msgid="316392039157473848">"appအား တပ်ဆင်ထားသည့် နှိုးစက်နာရီ app ထဲတွင် နှိုးစက်ကို သတ်မှတ်ခွင့် ပြုသည်။ အချို့ နှိုးစက် appများက ထိုအင်္ဂါရပ်ကို ပြီးမြောက်အောင် မလုပ်နိုင်ကြပါ။"</string>
+ <string name="permdesc_setAlarm" msgid="316392039157473848">"appအား တပ်ဆင်ထားသည့် နှိုးစက်နာရီ app ထဲတွင် နှိုးစက်ကို သတ်မှတ်ခွင့် ပြုသည်။ အချို့ နှိုးစက် appများက ထိုအင်္ဂါရပ်ကို ပြီးမြောက်အောင် မလုပ်နိုင်ကြပါ။"</string>
<string name="permlab_writeVoicemail" msgid="7309899891683938100">"အသံမေးလ်ကို ရေးရန်"</string>
- <string name="permdesc_writeVoicemail" msgid="6592572839715924830">"appအား သင်၏ အသံမေးလ် ဝင်စာများကို မွမ်းမံခွင့် နှင့် ဖယ်ရှားခွင့် ပြုသည်။"</string>
- <string name="permlab_addVoicemail" msgid="5525660026090959044">"အသံစာပို့စနစ်အားထည့်ရန်"</string>
- <string name="permdesc_addVoicemail" msgid="6604508651428252437">"appအား သင့် အသံမေးလ် ဝင်စာသို့ စာများကို ထည့်ခွင့် ပြုသည်။"</string>
+ <string name="permdesc_writeVoicemail" msgid="6592572839715924830">"appအား သင်၏ အသံမေးလ် ဝင်စာများကို မွမ်းမံခွင့် နှင့် ဖယ်ရှားခွင့် ပြုသည်။"</string>
+ <string name="permlab_addVoicemail" msgid="5525660026090959044">"အသံစာပို့စနစ်အားထည့်ရန်"</string>
+ <string name="permdesc_addVoicemail" msgid="6604508651428252437">"appအား သင့် အသံမေးလ် ဝင်စာသို့ စာများကို ထည့်ခွင့် ပြုသည်။"</string>
<string name="permlab_readVoicemail" msgid="8415201752589140137">"အသံမေးလ်ကို ဖတ်ရန်"</string>
- <string name="permdesc_readVoicemail" msgid="8926534735321616550">"appအား သင်၏ အသံမေးလ်များကို ဖတ်ခွင့် ပြုရန်"</string>
- <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"ဘရောင်ဇာ ဘူမိဇုန်သတ်မှတ်မှု ခွင့်ပြုချက်များကို မွမ်းမံခြင်း"</string>
- <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"appအား ဘရောင်ဇာ၏ ဘူမိဇုန်သတ်မှတ်ရေး ခွင့်ပြုချက်များကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးချပြီး လိုရာ ဝက်ဘ်ဆိုက်များသို့ တည်နေရာ အချက်အလက် ပို့မှုကို လုပ်နိုင်သည်။"</string>
+ <string name="permdesc_readVoicemail" msgid="8926534735321616550">"appအား သင်၏ အသံမေးလ်များကို ဖတ်ခွင့် ပြုရန်"</string>
+ <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"ဘရောင်ဇာ ဘူမိဇုန်သတ်မှတ်မှု ခွင့်ပြုချက်များကို မွမ်းမံခြင်း"</string>
+ <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"appအား ဘရောင်ဇာ၏ ဘူမိဇုန်သတ်မှတ်ရေး ခွင့်ပြုချက်များကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် appများက ၎င်းကို အသုံးချပြီး လိုရာ ဝက်ဘ်ဆိုက်များသို့ တည်နေရာ အချက်အလက် ပို့မှုကို လုပ်နိုင်သည်။"</string>
<string name="permlab_packageVerificationAgent" msgid="5568139100645829117">"packages များကိုအတည်ပြုစိစစ်ခြင်း"</string>
- <string name="permdesc_packageVerificationAgent" msgid="8437590190990843381">"appအား အထုပ် တစ်ခု၏ မတည်ငြိမ်မှုကို စိစစ်ခွင့် ပြုသည်။"</string>
- <string name="permlab_bindPackageVerifier" msgid="4187786793360326654">"package အတည်ပြုခြင်းနှင့် ပူးပေါင်းရန်"</string>
- <string name="permdesc_bindPackageVerifier" msgid="3180741773233862126">"စွဲကိုင်ထားသူအား အထုပ်များအား စိစစ်ရေး တောင်းဆိုချက်များကို ပြုလုပ်ခွင့် ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
+ <string name="permdesc_packageVerificationAgent" msgid="8437590190990843381">"appအား အထုပ် တစ်ခု၏ မတည်ငြိမ်မှုကို စိစစ်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_bindPackageVerifier" msgid="4187786793360326654">"package အတည်ပြုခြင်းနှင့် ပူးပေါင်းရန်"</string>
+ <string name="permdesc_bindPackageVerifier" msgid="3180741773233862126">"စွဲကိုင်ထားသူအား အထုပ်များအား စိစစ်ရေး တောင်းဆိုချက်များကို ပြုလုပ်ခွင့် ပေးသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string>
<string name="permlab_serialPort" msgid="546083327654631076">"အစဥ်လိုက်ပို့များကို ဝင်ရောက်ချိတ်ဆက်ခြင်း"</string>
- <string name="permdesc_serialPort" msgid="2991639985224598193">"SerialManager APIအားအသုံးပြုကာ ကိုင်ဆောင်သူကို စီရီယာပို့မျာကို ဝင်ရောက်အသုံးပြုခြင်းအား ခွင့်ပြုသည်။"</string>
+ <string name="permdesc_serialPort" msgid="2991639985224598193">"SerialManager APIအားအသုံးပြုကာ ကိုင်ဆောင်သူကို စီရီယာပို့မျာကို ဝင်ရောက်အသုံးပြုခြင်းအား ခွင့်ပြုသည်။"</string>
<string name="permlab_accessContentProvidersExternally" msgid="5077774297943409285">"အချက်အလက်များ ပံ့ပိုသူများအား အပြင်ဖက်မှ ရယူခြင်း"</string>
<string name="permdesc_accessContentProvidersExternally" msgid="4544346486697853685">"ကိုင်ဆောင်ထားသူကို အချက်အလက်ပံ့ပိုးမှုများကို ကွန်ဆိုးလ်မှ ရယူခွင့် ပြုပါ။ ပုံမှန်အပလီကေးရှင်းအတွက် မလိုအပ်ပါ။"</string>
<string name="permlab_updateLock" msgid="3527558366616680889">"စက်အလိုအလျောက်အဆင်မြှင့်ခြင်း အားမပေးရန်"</string>
@@ -1042,8 +1044,8 @@
<string name="save_password_message" msgid="767344687139195790">"ဤလျှို့ဝှက်စကားဝှက်အား ဘရောင်ဇာကိုမှတ်ခိုင်းမည်လား"</string>
<string name="save_password_notnow" msgid="6389675316706699758">"ယခုမဟုတ်ပါ"</string>
<string name="save_password_remember" msgid="6491879678996749466">"မှတ်ထားရန်"</string>
- <string name="save_password_never" msgid="8274330296785855105">"မည်သည့်အခါမှ"</string>
- <string name="open_permission_deny" msgid="7374036708316629800">"သင့်ဆီမှာ ဒီစာမျက်နှာကို ဖွင့်ရန် ခွင့်ပြုချက် မရှိပါ။"</string>
+ <string name="save_password_never" msgid="8274330296785855105">"မည်သည့်အခါမှ"</string>
+ <string name="open_permission_deny" msgid="7374036708316629800">"သင့်ဆီမှာ ဒီစာမျက်နှာကို ဖွင့်ရန် ခွင့်ပြုချက် မရှိပါ။"</string>
<string name="text_copied" msgid="4985729524670131385">"clipboardထံ စာသားအားကူးယူမည်"</string>
<string name="more_item_label" msgid="4650918923083320495">"နောက်ထပ်"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
@@ -1062,8 +1064,8 @@
<string name="oneMonthDurationPast" msgid="7396384508953779925">"လွန်ခဲ့သော၁လက"</string>
<string name="beforeOneMonthDurationPast" msgid="909134546836499826">"လွန်ခဲ့သော၁လမတိုင်မီက"</string>
<plurals name="num_seconds_ago">
- <item quantity="one" msgid="4869870056547896011">"လွန်ခဲ့သော ၁စက္ကန့်က"</item>
- <item quantity="other" msgid="3903706804349556379">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item>
+ <item quantity="one" msgid="4869870056547896011">"လွန်ခဲ့သော ၁စက္ကန့်က"</item>
+ <item quantity="other" msgid="3903706804349556379">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item>
</plurals>
<plurals name="num_minutes_ago">
<item quantity="one" msgid="3306787433088810191">"လွန်ခဲ့သော ၁မိနစ်က"</item>
@@ -1083,8 +1085,8 @@
<item quantity="other" msgid="2479586466153314633">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item>
</plurals>
<plurals name="in_num_seconds">
- <item quantity="one" msgid="2729745560954905102">"နောက် ၁စက္ကန့်တွင်"</item>
- <item quantity="other" msgid="1241926116443974687">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item>
+ <item quantity="one" msgid="2729745560954905102">"နောက် ၁စက္ကန့်တွင်"</item>
+ <item quantity="other" msgid="1241926116443974687">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item>
</plurals>
<plurals name="in_num_minutes">
<item quantity="one" msgid="8793095251325200395">"နောက်၁မီနစ်တွင်"</item>
@@ -1099,8 +1101,8 @@
<item quantity="other" msgid="5109449375100953247">"နောက် <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item>
</plurals>
<plurals name="abbrev_num_seconds_ago">
- <item quantity="one" msgid="1849036840200069118">"လွန်ခဲ့သော ၁စက္ကန့်က"</item>
- <item quantity="other" msgid="3699169366650930415">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item>
+ <item quantity="one" msgid="1849036840200069118">"လွန်ခဲ့သော ၁စက္ကန့်က"</item>
+ <item quantity="other" msgid="3699169366650930415">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item>
</plurals>
<plurals name="abbrev_num_minutes_ago">
<item quantity="one" msgid="6361490147113871545">"လွန်ခဲ့သော ၁မိနစ်က"</item>
@@ -1115,8 +1117,8 @@
<item quantity="other" msgid="3453342639616481191">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item>
</plurals>
<plurals name="abbrev_in_num_seconds">
- <item quantity="one" msgid="5842225370795066299">"နောက် ၁စက္ကန့်တွင်"</item>
- <item quantity="other" msgid="5495880108825805108">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item>
+ <item quantity="one" msgid="5842225370795066299">"နောက် ၁စက္ကန့်တွင်"</item>
+ <item quantity="other" msgid="5495880108825805108">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item>
</plurals>
<plurals name="abbrev_in_num_minutes">
<item quantity="one" msgid="562786149928284878">"နောက်၁မိနစ်တွင်"</item>
@@ -1139,8 +1141,8 @@
<string name="hours" msgid="894424005266852993">"နာရီများ"</string>
<string name="minute" msgid="9148878657703769868">"မိနစ်"</string>
<string name="minutes" msgid="5646001005827034509">"မိနစ်"</string>
- <string name="second" msgid="3184235808021478">"စက္ကန့်"</string>
- <string name="seconds" msgid="3161515347216589235">"စက္ကန့်"</string>
+ <string name="second" msgid="3184235808021478">"စက္ကန့်"</string>
+ <string name="seconds" msgid="3161515347216589235">"စက္ကန့်"</string>
<string name="week" msgid="5617961537173061583">"အပတ်"</string>
<string name="weeks" msgid="6509623834583944518">"အပတ်"</string>
<string name="year" msgid="4001118221013892076">"နှစ်"</string>
@@ -1158,12 +1160,12 @@
<item quantity="other" msgid="3863962854246773930">"<xliff:g id="COUNT">%d</xliff:g> နာရီ"</item>
</plurals>
<string name="VideoView_error_title" msgid="3534509135438353077">"ဗီဒီယို ပြဿနာ"</string>
- <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ဒီဗိဒီယိုမှာ ဒီကိရိယာ ပေါ်မှာ ဖွင့်ကြည့်၍ မရနိုင်ပါ။"</string>
+ <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ဒီဗိဒီယိုမှာ ဒီကိရိယာ ပေါ်မှာ ဖွင့်ကြည့်၍ မရနိုင်ပါ။"</string>
<string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ဒီဗီဒီယိုကို ပြသလို့ မရပါ"</string>
<string name="VideoView_error_button" msgid="2822238215100679592">"ကောင်းပြီ"</string>
<string name="relative_time" msgid="1818557177829411417">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
- <string name="noon" msgid="7245353528818587908">"မွန်းတည့်"</string>
- <string name="Noon" msgid="3342127745230013127">"မွန်းတည့်"</string>
+ <string name="noon" msgid="7245353528818587908">"မွန်းတည့်"</string>
+ <string name="Noon" msgid="3342127745230013127">"မွန်းတည့်"</string>
<string name="midnight" msgid="7166259508850457595">"ညသန်းခေါင်"</string>
<string name="Midnight" msgid="5630806906897892201">"ညသန်းခေါင်"</string>
<string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
@@ -1179,7 +1181,7 @@
<string name="textSelectionCABTitle" msgid="5236850394370820357">"စာတိုရွေးချယ်မှု"</string>
<string name="addToDictionary" msgid="4352161534510057874">"အဘိဓာန်ထဲ ထည့်ပါ"</string>
<string name="deleteText" msgid="6979668428458199034">"ဖျက်ပစ်ရန်"</string>
- <string name="inputMethod" msgid="1653630062304567879">"ထည့်သွင်းရန်နည်းလမ်း"</string>
+ <string name="inputMethod" msgid="1653630062304567879">"ထည့်သွင်းရန်နည်းလမ်း"</string>
<string name="editTextMenuTitle" msgid="4909135564941815494">"စာတို လုပ်ဆောင်ချက်"</string>
<string name="low_internal_storage_view_title" msgid="5576272496365684834">"သိမ်းဆည်သော နေရာ နည်းနေပါသည်"</string>
<string name="low_internal_storage_view_text" msgid="6640505817617414371">"တချို့ စနစ်လုပ်ငန်းများ အလုပ် မလုပ်ခြင်း ဖြစ်နိုင်ပါသည်"</string>
@@ -1197,10 +1199,10 @@
<string name="whichApplicationNamed" msgid="8260158865936942783">"%1$s ကို သုံးပြီး လုပ်ဆောင်ချက် ပြီးဆုံးပါစေ"</string>
<string name="whichViewApplication" msgid="3272778576700572102">"...ဖြင့် ဖွင့်မည်"</string>
<string name="whichViewApplicationNamed" msgid="2286418824011249620">"%1$s ဖြင့် ဖွင့်မည်"</string>
- <string name="whichEditApplication" msgid="144727838241402655">"...နှင့် တည်းဖြတ်ရန်"</string>
- <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s နှင့် တည်းဖြတ်ရန်"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"...နှင့် မျှဝေရန်"</string>
- <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sနှင့် မျှဝေရန်"</string>
+ <string name="whichEditApplication" msgid="144727838241402655">"...နှင့် တည်းဖြတ်ရန်"</string>
+ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s နှင့် တည်းဖြတ်ရန်"</string>
+ <string name="whichSendApplication" msgid="6902512414057341668">"...နှင့် မျှဝေရန်"</string>
+ <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sနှင့် မျှဝေရန်"</string>
<string name="whichHomeApplication" msgid="4616420172727326782">"ပင်မ အပလီကေးရှင်း ရွေးချယ်ပါ"</string>
<string name="alwaysUse" msgid="4583018368000610438">"ဤလှုပ်ရှားမှုအတွက် မူရင်းအတိုင်း အသုံးပြုပါ။"</string>
<string name="clearDefaultHintMsg" msgid="3252584689512077257">"စနစ် ဆက်တင် ထဲမှာ ပုံသေကို ရှင်းလိုက်ပါ > Appများ > ဒေါင်းလုဒ် လုပ်ပြီး။"</string>
@@ -1208,8 +1210,8 @@
<string name="chooseUsbActivity" msgid="6894748416073583509">"USB ကိရိယာ အတွက် app တစ်ခု ရွေးပါ"</string>
<string name="noApplications" msgid="2991814273936504689">"ဘယ် appကမှ ဒီ လုပ်ဆောင်ချက်ကို မလုပ်ကိုင်နိုင်ပါ။"</string>
<string name="aerr_title" msgid="1905800560317137752"></string>
- <string name="aerr_application" msgid="932628488013092776">"ဝမ်းနည်းစွာဖြင့်<xliff:g id="APPLICATION">%1$s</xliff:g>မှာ ရပ်ဆိုင်းသွားသည်။"</string>
- <string name="aerr_process" msgid="4507058997035697579">"ဝမ်းနည်းစွာဖြင့် လုပ်ဆောင်ချက်<xliff:g id="PROCESS">%1$s</xliff:g>မှာ ရပ်ဆိုင်းသွားသည်။"</string>
+ <string name="aerr_application" msgid="932628488013092776">"ဝမ်းနည်းစွာဖြင့်<xliff:g id="APPLICATION">%1$s</xliff:g>မှာ ရပ်ဆိုင်းသွားသည်။"</string>
+ <string name="aerr_process" msgid="4507058997035697579">"ဝမ်းနည်းစွာဖြင့် လုပ်ဆောင်ချက်<xliff:g id="PROCESS">%1$s</xliff:g>မှာ ရပ်ဆိုင်းသွားသည်။"</string>
<string name="anr_title" msgid="4351948481459135709"></string>
<string name="anr_activity_application" msgid="1904477189057199066">"<xliff:g id="APPLICATION">%2$s</xliff:g> က မတုံ့ပြန်ပါ။ \n\n၎င်းကို သင် ပိတ်လိုပါသလား?"</string>
<string name="anr_activity_process" msgid="5776209883299089767">"လှုပ်ရှားမှု <xliff:g id="ACTIVITY">%1$s</xliff:g>က မတုံ့ပြန်ပါ။\n\n၎င်းကို သင် ပိတ်လိုပါသလား?"</string>
@@ -1217,35 +1219,35 @@
<string name="anr_process" msgid="6513209874880517125">"ဖြစ်စဉ်<xliff:g id="PROCESS">%1$s</xliff:g> က မတုံ့ပြန်ပါ။ \n\n၎င်းကို သင် ပိတ် ချင်သလား?"</string>
<string name="force_close" msgid="8346072094521265605">"ကောင်းပြီ"</string>
<string name="report" msgid="4060218260984795706">"သတင်းပို့ခြင်း"</string>
- <string name="wait" msgid="7147118217226317732">"စောင့်ဆိုင်းရန်"</string>
+ <string name="wait" msgid="7147118217226317732">"စောင့်ဆိုင်းရန်"</string>
<string name="webpage_unresponsive" msgid="3272758351138122503">"စာမျက်နှာမှာ ပြန်လည် တုံ့ပြန်မှု မရှိတော့ပါ။\n\nပိတ်လိုက်ချင်ပါသလား?"</string>
<string name="launch_warning_title" msgid="1547997780506713581">"App ပြန်ညွှန်းခဲ့"</string>
<string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> သည် ယခုအလုပ်လုပ်နေသည်"</string>
- <string name="launch_warning_original" msgid="188102023021668683">"မူလ <xliff:g id="APP_NAME">%1$s</xliff:g> တွင် ထုတ်လွင့်သည်"</string>
+ <string name="launch_warning_original" msgid="188102023021668683">"မူလ <xliff:g id="APP_NAME">%1$s</xliff:g> တွင် ထုတ်လွင့်သည်"</string>
<string name="screen_compat_mode_scale" msgid="3202955667675944499">"စကေး"</string>
<string name="screen_compat_mode_show" msgid="4013878876486655892">"အမြဲပြသရန်"</string>
- <string name="screen_compat_mode_hint" msgid="1064524084543304459">"ဒါကို စနစ် ဆက်တင်များထဲ ပြန်ဖွင့်ပေးရန် > Apps > ဒေါင်းလုဒ် လုပ်ပြီး။"</string>
- <string name="smv_application" msgid="3307209192155442829">"app <xliff:g id="APPLICATION">%1$s</xliff:g> (လုပ်ငန်းစဉ် <xliff:g id="PROCESS">%2$s</xliff:g>) က ကိုယ်တိုင် ပြဌာန်းခဲ့သည့် StrictMode မူဝါဒကို ချိုးဖောက်ခဲ့သည်။"</string>
+ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"ဒါကို စနစ် ဆက်တင်များထဲ ပြန်ဖွင့်ပေးရန် > Apps > ဒေါင်းလုဒ် လုပ်ပြီး။"</string>
+ <string name="smv_application" msgid="3307209192155442829">"app <xliff:g id="APPLICATION">%1$s</xliff:g> (လုပ်ငန်းစဉ် <xliff:g id="PROCESS">%2$s</xliff:g>) က ကိုယ်တိုင် ပြဌာန်းခဲ့သည့် StrictMode မူဝါဒကို ချိုးဖောက်ခဲ့သည်။"</string>
<string name="smv_process" msgid="5120397012047462446">"ဤ<xliff:g id="PROCESS">%1$s</xliff:g>ဖြစ်စဥ်မှာ ကိုယ်တိုင်အကျိုးသက်ရောက်သော StrictModeမူဝါဒအား ချိုးဖောက်သည်"</string>
<string name="android_upgrading_title" msgid="1584192285441405746">"အန်ဒရွိုက်ကို မွမ်းမံနေ…"</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> ထဲက app<xliff:g id="NUMBER_1">%2$d</xliff:g>ကို ဆီလျော်အောင် လုပ်နေ"</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"appများကို စတင်နေ"</string>
- <string name="android_upgrading_complete" msgid="1405954754112999229">"လုပ်ငန်းစနစ်ထည့်သွင်း၍ ပြန်လည်စတင်ရန် ပြီးပါပြီ"</string>
+ <string name="android_upgrading_complete" msgid="1405954754112999229">"လုပ်ငန်းစနစ်ထည့်သွင်း၍ ပြန်လည်စတင်ရန် ပြီးပါပြီ"</string>
<string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> က အလုပ်လုပ်နေသည်"</string>
<string name="heavy_weight_notification_detail" msgid="1721681741617898865">"ppဆီ ပြောင်းရန် ထိပါ"</string>
<string name="heavy_weight_switcher_title" msgid="7153167085403298169">"appများကို ပြောင်းမလား?"</string>
<string name="heavy_weight_switcher_text" msgid="7022631924534406403">"အခြား app တစ်ခု အလုပ်လုပ်နေ၍ သင်က အသစ် တစ်ခုကို မစမီ ၎င်းကို ရပ်ပစ်ရမည်။"</string>
<string name="old_app_action" msgid="493129172238566282">"<xliff:g id="OLD_APP">%1$s</xliff:g>သို့ပြန်သွားရန်"</string>
- <string name="old_app_description" msgid="2082094275580358049">"pp အသစ်ကို မစတင်ပါနှင့်။"</string>
+ <string name="old_app_description" msgid="2082094275580358049">"pp အသစ်ကို မစတင်ပါနှင့်။"</string>
<string name="new_app_action" msgid="5472756926945440706">"<xliff:g id="OLD_APP">%1$s</xliff:g>စတင်ပါ"</string>
<string name="new_app_description" msgid="1932143598371537340">"app အဟောင်းကို မသိမ်းဆည်းဘဲ ရပ်လိုက်ပါ။"</string>
<string name="sendText" msgid="5209874571959469142">"စာတိုအတွက် လုပ်ဆောင်ချက် ရေးပါ"</string>
<string name="volume_ringtone" msgid="6885421406845734650">"ဖုန်းမြည်သံအတိုးအကျယ်"</string>
<string name="volume_music" msgid="5421651157138628171">"မီဒီယာအသံအတိုးအကျယ်"</string>
- <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"ဘလူးတူးသ်မှတဆင့်ဖွင့်ရန်"</string>
+ <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"ဘလူးတူးသ်မှတဆင့်ဖွင့်ရန်"</string>
<string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"အသံတိတ် မြည်သံ သတ်မှတ်ရန်"</string>
<string name="volume_call" msgid="3941680041282788711">"ခေါ်ဆိုနေခြင်းအသံအတိုးအကျယ်"</string>
- <string name="volume_bluetooth_call" msgid="2002891926351151534">"ဘလူးတုသ်ဖြင့် ခေါ်ဆိုနေခြင်းအသံအတိုးအကျယ်"</string>
+ <string name="volume_bluetooth_call" msgid="2002891926351151534">"ဘလူးတုသ်ဖြင့် ခေါ်ဆိုနေခြင်းအသံအတိုးအကျယ်"</string>
<string name="volume_alarm" msgid="1985191616042689100">"နှိုးစက်သံအတိုးအကျယ်"</string>
<string name="volume_notification" msgid="2422265656744276715">"အကြောင်းကြားသံအတိုးအကျယ်"</string>
<string name="volume_unknown" msgid="1400219669770445902">"အသံအတိုးအကျယ်"</string>
@@ -1264,8 +1266,8 @@
<item quantity="other" msgid="4192424489168397386">"ဝိုင်ဖိုင်ကွန်ယက်များရှိသည်"</item>
</plurals>
<plurals name="wifi_available_detailed">
- <item quantity="one" msgid="1634101450343277345">"ဖွင့်ထားသောဝိုင်ဖိုင်ကွန်ယက်ရှိသည်"</item>
- <item quantity="other" msgid="7915895323644292768">"ဖွင့်ထားသောဝိုင်ဖိုင်ကွန်ယက်များရှိသည်"</item>
+ <item quantity="one" msgid="1634101450343277345">"ဖွင့်ထားသောဝိုင်ဖိုင်ကွန်ယက်ရှိသည်"</item>
+ <item quantity="other" msgid="7915895323644292768">"ဖွင့်ထားသောဝိုင်ဖိုင်ကွန်ယက်များရှိသည်"</item>
</plurals>
<string name="wifi_available_sign_in" msgid="4029489716605255386">"ဝိုင်ဖိုင်ကွန်ရက်သို့ ဝင်ပါ"</string>
<string name="network_available_sign_in" msgid="8495155593358054676">"ကွန်ရက်သို့ ဝင်ပါ"</string>
@@ -1276,7 +1278,7 @@
<string name="wifi_p2p_dialog_title" msgid="97611782659324517">"တိုက်ရိုက် ဝိုင်ဖိုင်"</string>
<string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"တိုက်ရိုက်ဝိုင်ဖိုင်ကို စတင်ပါ။ ၎င်းသည် ဝိုင်ဖိုင် ဟော့စပေါ့ကို ရပ်ဆိုင်းစေမှာ ဖြစ်ပါသည်။"</string>
<string name="wifi_p2p_failed_message" msgid="3763669677935623084">"တိုက်ရိုက်ဝိုင်ဖိုင်ကို စတင်လို့ မရပါ"</string>
- <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"ဝိုင်ဖိုင် တိုက်ရိုက် ကိုဖွင့်ထားသည်"</string>
+ <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"ဝိုင်ဖိုင် တိုက်ရိုက် ကိုဖွင့်ထားသည်"</string>
<string name="wifi_p2p_enabled_notification_message" msgid="1638949953993894335">"အပြင်အဆင်များအတွက်ထိပါ"</string>
<string name="accept" msgid="1645267259272829559">"လက်ခံရန်"</string>
<string name="decline" msgid="2112225451706137894">"လက်မခံပါ"</string>
@@ -1288,8 +1290,8 @@
<string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ပင် နံပါတ်:"</string>
<string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် ဆက်သွယ်ထားစဉ် တက်ဘလက်ဟာ ဝိုင်ဖိုင် နှင့် ဆက်သွယ်မှု ရပ်ဆိုင်းထားမှာ ဖြစ်ပါတယ်"</string>
<string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို ဆက်သွယ်ထားစဉ် ဖုန်းအား ဝိုင်ဖိုင်မှ ဆက်သွယ်မှု ရပ်ဆိုင်းထားပါမည်"</string>
- <string name="select_character" msgid="3365550120617701745">"စာရိုက်ထည့်ရန်"</string>
- <string name="sms_control_title" msgid="7296612781128917719">"စာတိုပို့စနစ်(SMS)ဖြင့် စာများ ပို့သည်"</string>
+ <string name="select_character" msgid="3365550120617701745">"စာရိုက်ထည့်ရန်"</string>
+ <string name="sms_control_title" msgid="7296612781128917719">"စာတိုပို့စနစ်(SMS)ဖြင့် စာများ ပို့သည်"</string>
<string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> မှ စာ အမြောက်အများ ပို့နေပါသည်။ ဒီအပလီကေးရှင်းကို ဆက်လက်ပြီး လုပ်ဆောင်ရန် ခွင့်ပြုပါမလား"</string>
<string name="sms_control_yes" msgid="3663725993855816807">"ခွင့်ပြုရန်"</string>
<string name="sms_control_no" msgid="625438561395534982">"ငြင်းပယ်ခြင်း"</string>
@@ -1303,10 +1305,10 @@
<string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"အမြဲခွင့်ပြုရန်"</string>
<string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"ဘယ်တော့မှခွင့်မပြုပါ"</string>
<string name="sim_removed_title" msgid="6227712319223226185">"SIMကဒ်ဖယ်ရှားခြင်း"</string>
- <string name="sim_removed_message" msgid="5450336489923274918">"သင်က မှန်ကန်သည့် ဆင်းမ် ကဒ် တစ်ခုနှင့် ပြန်မစမချင်း ဆယ်လူလာ ကွန်ရက်ကို ရှာတွေ့မည် မဟုတ်ပါ။"</string>
+ <string name="sim_removed_message" msgid="5450336489923274918">"သင်က မှန်ကန်သည့် ဆင်းမ် ကဒ် တစ်ခုနှင့် ပြန်မစမချင်း ဆယ်လူလာ ကွန်ရက်ကို ရှာတွေ့မည် မဟုတ်ပါ။"</string>
<string name="sim_done_button" msgid="827949989369963775">"ပြီးပါပြီ"</string>
- <string name="sim_added_title" msgid="3719670512889674693">"ဆင်းမ်ကဒ် ထည့်ပါသည်"</string>
- <string name="sim_added_message" msgid="7797975656153714319">"ဆယ်လူလာ ကွန်ရက်ကို ရယူသုံးရန် သင့် ကိရိယာကို ပြန်ဖွင့်ပေးပါ။"</string>
+ <string name="sim_added_title" msgid="3719670512889674693">"ဆင်းမ်ကဒ် ထည့်ပါသည်"</string>
+ <string name="sim_added_message" msgid="7797975656153714319">"ဆယ်လူလာ ကွန်ရက်ကို ရယူသုံးရန် သင့် ကိရိယာကို ပြန်ဖွင့်ပေးပါ။"</string>
<string name="sim_restart_button" msgid="4722407842815232347">"အစက ပြန်စရန်"</string>
<string name="time_picker_dialog_title" msgid="8349362623068819295">"အချိန်သတ်မှတ်ရန်"</string>
<string name="date_picker_dialog_title" msgid="5879450659453782278">"ရက်စွဲ အတည်ပြုရန်"</string>
@@ -1314,13 +1316,13 @@
<string name="date_time_done" msgid="2507683751759308828">"ပြီးပါပြီ"</string>
<string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"အသစ်: "</font></string>
<string name="perms_description_app" msgid="5139836143293299417">"<xliff:g id="APP_NAME">%1$s</xliff:g> မှ ထောက်ပံ့သည်"</string>
- <string name="no_permissions" msgid="7283357728219338112">"ခွင့်ပြုချက်မလိုအပ်ပါ"</string>
+ <string name="no_permissions" msgid="7283357728219338112">"ခွင့်ပြုချက်မလိုအပ်ပါ"</string>
<string name="perm_costs_money" msgid="4902470324142151116">"သင့်အတွက် ပိုက်ဆံကုန်ကျနိုင်ပါသည်"</string>
<string name="usb_storage_activity_title" msgid="4465055157209648641">"USB ဖြင့်အချက်အလက်မြောက်များစွာ သိမ်းဆည်းနိုင်သော နေရာ"</string>
<string name="usb_storage_title" msgid="5901459041398751495">"USB ချိန်ဆက်ထားပြီး"</string>
<string name="usb_storage_message" product="nosdcard" msgid="3308538094316477839">"သင့်ကွန်ပျူတာကို USB မှ တဆင့် ဆက်သွယ်ထားပါသည်။ ကွန်ပျူတာနဲ့ အန်းဒရွိုက်၏ USB သိုလှောင်မှု အကြား အချက်အလက် လွှဲပြောင်းရန် တို့ထိပါ"</string>
<string name="usb_storage_message" product="default" msgid="805351000446037811">"သင့်ကွန်ပျူတာကို USB မှ တဆင့် ဆက်သွယ်ထားပါသည်။ ကွန်ပျူတာနဲ့ အန်းဒရွိုက်၏ SD ကဒ် အကြား အချက်အလက် လွှဲပြောင်းရန် တို့ထိပါ"</string>
- <string name="usb_storage_button_mount" msgid="1052259930369508235">"USBသိမ်းဆည်းခြင်းကိုဖွင့်ရန်"</string>
+ <string name="usb_storage_button_mount" msgid="1052259930369508235">"USBသိမ်းဆည်းခြင်းကိုဖွင့်ရန်"</string>
<string name="usb_storage_error_message" product="nosdcard" msgid="3017045217365540658">"USB ကို သုံးပြီး USB ဖြင့်အချက်အလက်မြောက်များစွာ သိမ်းဆည်းနိုင်သော နေရာတွင် ပြသနာ ဖြစ်နေပါသည်"</string>
<string name="usb_storage_error_message" product="default" msgid="2876018512716970313">"SD card ကို သုံးပြီး USB ဖြင့်အချက်အလက်မြောက်များစွာ သိမ်းဆည်းနိုင်သော နေရာတွင် ပြသနာ ဖြစ်နေပါသည်"</string>
<string name="usb_storage_notification_title" msgid="8175892554757216525">"USB ချိန်ဆက်ထားပြီး"</string>
@@ -1332,19 +1334,19 @@
<string name="usb_storage_stop_message" product="default" msgid="8043969782460613114">"USB သိုလှောင်မှုကို မပိတ်ခင်, ကွန်ပျူတာမှ Android ၏ SD ကဒ်ကို ဖြုတ်ပါ (\"eject\")"</string>
<string name="usb_storage_stop_button_mount" msgid="7060218034900696029">"USBသိမ်းဆည်းခြင်းကိုပိတ်ရန်"</string>
<string name="usb_storage_stop_error_message" msgid="1970374898263063836">"USB သိုလှောင်မှု ပိတ်ရာတွင် ပြသနာရှိပါသည်။ USB လာရာအား မဆက်သွယ်ထားကြောင်း စစ်ဆေးပြီး ပြန်လည်ကြိုးစားပါ"</string>
- <string name="dlg_confirm_kill_storage_users_title" msgid="963039033470478697">"USBသိမ်းဆည်းခြင်းကိုဖွင့်ရန်"</string>
+ <string name="dlg_confirm_kill_storage_users_title" msgid="963039033470478697">"USBသိမ်းဆည်းခြင်းကိုဖွင့်ရန်"</string>
<string name="dlg_confirm_kill_storage_users_text" msgid="5100428757107469454">"သင် ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှုကို ဖွင့်လိုက်ပါက တချို့ အပလီကေးရှင်းများ က ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှု ပြန်ပိတ်သည်အထိ အလုပ်မလုပ် သို့ သုံးစွဲရန် ရှိနေမည် မဟုတ်ပါ"</string>
<string name="dlg_error_title" msgid="7323658469626514207">"USBဆောင်ရွက်မှုမအောင်မြင်ပါ"</string>
<string name="dlg_ok" msgid="7376953167039865701">"ကောင်းပြီ"</string>
- <string name="usb_mtp_notification_title" msgid="3699913097391550394">"မီဒီယာစက်အနေဖြင့် ချိတ်ဆက်သည်"</string>
- <string name="usb_ptp_notification_title" msgid="1960817192216064833">"ကင်မရာအနေဖြင့်ဆက်သွယ်ခြင်း"</string>
- <string name="usb_cd_installer_notification_title" msgid="6774712827892090754">"installerအနေဖြင့် ချိတ်ဆက်သည်"</string>
+ <string name="usb_mtp_notification_title" msgid="3699913097391550394">"မီဒီယာစက်အနေဖြင့် ချိတ်ဆက်သည်"</string>
+ <string name="usb_ptp_notification_title" msgid="1960817192216064833">"ကင်မရာအနေဖြင့်ဆက်သွယ်ခြင်း"</string>
+ <string name="usb_cd_installer_notification_title" msgid="6774712827892090754">"installerအနေဖြင့် ချိတ်ဆက်သည်"</string>
<string name="usb_accessory_notification_title" msgid="7848236974087653666">"USBတွဲဖက်ပစ္စည်းအား ချိတ်ဆက်ထားသည်"</string>
<string name="usb_notification_message" msgid="2290859399983720271">"အခြား USB စိတ်ကြိုက်ရွေးချယ်ခွင့်များ အတွက် တို့ထိပါ။"</string>
<string name="extmedia_format_title" product="nosdcard" msgid="9020092196061007262">"USB သိုလှောင်ခန်းကို ပုံစံပြန်ချမလား?"</string>
<string name="extmedia_format_title" product="default" msgid="3648415921526526069">"SD ကဒ်ကို ပုံစံပြန်ချမလား?"</string>
- <string name="extmedia_format_message" product="nosdcard" msgid="3934016853425761078">"သင်၏ USB သိုလှောင်ခန်းထဲ သိုလှောင်ထားသည့် ဖိုင်အားလုံး ဖျက်ခံရမည်။ ဒီလုပ်ရပ်ကို ပြန်ပြီး ပြောင်းလဲ မရနိုင်ပါ။"</string>
- <string name="extmedia_format_message" product="default" msgid="14131895027543830">"သင့် ကဒ် ထဲက ဒေတာ အားလုံး ဆုံးသွားမည်။"</string>
+ <string name="extmedia_format_message" product="nosdcard" msgid="3934016853425761078">"သင်၏ USB သိုလှောင်ခန်းထဲ သိုလှောင်ထားသည့် ဖိုင်အားလုံး ဖျက်ခံရမည်။ ဒီလုပ်ရပ်ကို ပြန်ပြီး ပြောင်းလဲ မရနိုင်ပါ။"</string>
+ <string name="extmedia_format_message" product="default" msgid="14131895027543830">"သင့် ကဒ် ထဲက ဒေတာ အားလုံး ဆုံးသွားမည်။"</string>
<string name="extmedia_format_button_format" msgid="4131064560127478695">"ပုံစံချရန်ပြင်ဆင်သည်"</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB အမှားစစ်ခြင်းအား ချိတ်ဆက်ထားသည်"</string>
<string name="adb_active_notification_message" msgid="1016654627626476142">"USB ဒီဘာဂင် ပိတ်ရန် ထိပါ။"</string>
@@ -1356,9 +1358,9 @@
<string name="select_keyboard_layout_notification_message" msgid="4465907700449257063">"လက်ကွက် အပြင်အဆင်ရွေးရန် တို့ထိပါ"</string>
<string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
<string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
- <string name="candidates_style" msgid="4333913089637062257"><u>"ရွေးချယ်ခံမည့်သူ"</u></string>
- <string name="ext_media_checking_notification_title" product="nosdcard" msgid="3449816005351468560">"USBသိမ်းဆည်းသည့်အရာအားအဆင်သင့်စေရန်ပြုလုပ်ခြင်း"</string>
- <string name="ext_media_checking_notification_title" product="default" msgid="5457603418970994050">"SDကဒ်အအဆင်သင့်စေရန်ပြုလုပ်ခြင်း"</string>
+ <string name="candidates_style" msgid="4333913089637062257"><u>"ရွေးချယ်ခံမည့်သူ"</u></string>
+ <string name="ext_media_checking_notification_title" product="nosdcard" msgid="3449816005351468560">"USBသိမ်းဆည်းသည့်အရာအားအဆင်သင့်စေရန်ပြုလုပ်ခြင်း"</string>
+ <string name="ext_media_checking_notification_title" product="default" msgid="5457603418970994050">"SDကဒ်အအဆင်သင့်စေရန်ပြုလုပ်ခြင်း"</string>
<string name="ext_media_checking_notification_message" msgid="8287319882926737053">"မှားယွင်းမှုရှိမရှိစစ်ခြင်း"</string>
<string name="ext_media_nofs_notification_title" product="nosdcard" msgid="7788040745686229307">"USBသိမ်းဆည်းမှု၌ ဘာမှမရှိပါ"</string>
<string name="ext_media_nofs_notification_title" product="default" msgid="780477838241212997">"SDကဒ်ထဲ၌ဘာမှမရှိပါ"</string>
@@ -1370,19 +1372,19 @@
<string name="ext_media_unmountable_notification_message" product="default" msgid="1753898567525568253">"SD ကဒ် ပျက်စီးနေပါသည်။ ပြန်လည် ဖောမက် ချကြည့်ပါ"</string>
<string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"မရည်ရွယ်ပဲ USBသိုလှောင်ကိရိယာဖယ်ရှားသည်"</string>
<string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"မထင်မှတ်ပဲSDကဒ်ဖြုတ်သည်"</string>
- <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"ဒေတာမဆုံးရှုံးစေရန် မပြုတ်ခင် USB သိမ်းဆည်းခြင်းအား မဖြုတ်ပါနှင့်"</string>
+ <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"ဒေတာမဆုံးရှုံးစေရန် မပြုတ်ခင် USB သိမ်းဆည်းခြင်းအား မဖြုတ်ပါနှင့်"</string>
<string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"ဒေတာမဆုံးရှုံးစေရန် မပြုတ်ခင် SDကဒ်အားမတပ်ရန်"</string>
<string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"USB ကိရိယာအား ဖြုတ်နိုင်သည်"</string>
<string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"အန္တရာယ်ကင်းစွာSDကဒ်အား ဖယ်နိုင်ပါပြီ"</string>
- <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"USBသိမ်းဆည်းသည့်အရာအား အန္တရာယ်ကင်းစွာဖယ်နိုင်ပါပြီ"</string>
+ <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"USBသိမ်းဆည်းသည့်အရာအား အန္တရာယ်ကင်းစွာဖယ်နိုင်ပါပြီ"</string>
<string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"SDကဒ်အား အန္တရာယ်ကင်းစွာဖယ်နိုင်ပါပြီ"</string>
<string name="ext_media_nomedia_notification_title" product="nosdcard" msgid="4486377230140227651">"USBသိုလှောင်ကိရိယာအား ဖြုတ်သည်"</string>
<string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"SDကဒ်ဖယ်ထားသည်"</string>
- <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"USBသိမ်းဆည်းသည့်အရာ ဖယ်ရှားလိုက်သည်။ နောက်မီဒီယာအသစ်တခုအားထည့်ပါ။"</string>
- <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"SDကဒ်အားဖယ်ရှားလိုက်သည်။ နောက်အသစ်တခုအားထည့်ပါ။"</string>
+ <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"USBသိမ်းဆည်းသည့်အရာ ဖယ်ရှားလိုက်သည်။ နောက်မီဒီယာအသစ်တခုအားထည့်ပါ။"</string>
+ <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"SDကဒ်အားဖယ်ရှားလိုက်သည်။ နောက်အသစ်တခုအားထည့်ပါ။"</string>
<string name="activity_list_empty" msgid="1675388330786841066">"တိုက်ဆိုင်သော ပြုလုပ်ချက် ရှာမတွေ့ပါ"</string>
- <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"အစိတ်အပိုင်းများသုံစွဲခြင်း ကိန်းဂဏန်းအချက်အလက်များကို အဆင်မြှင့်ရန်ပြုလုပ်ခြင်း"</string>
- <string name="permdesc_pkgUsageStats" msgid="1106612424254277630">"appအား စုစည်းထားသည့် အစိတ်အပိုင်း၏ သုံးစွဲမှု စာရင်းအင်းများကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
+ <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"အစိတ်အပိုင်းများသုံစွဲခြင်း ကိန်းဂဏန်းအချက်အလက်များကို အဆင်မြှင့်ရန်ပြုလုပ်ခြင်း"</string>
+ <string name="permdesc_pkgUsageStats" msgid="1106612424254277630">"appအား စုစည်းထားသည့် အစိတ်အပိုင်း၏ သုံးစွဲမှု စာရင်းအင်းများကို မွမ်းမံခွင့် ပြုသည်။ သာမန် appများ အသုံးပြုရန် မဟုတ်ပါ။"</string>
<string name="permlab_copyProtectedData" msgid="4341036311211406692">"အကြောင်းအရာ ကော်ပီ လုပ်ရန်"</string>
<string name="permdesc_copyProtectedData" msgid="4390697124288317831">"appအား ပုံသေ ကွန်တင်နား ဝန်ဆောင်မှု၏ အကြောင်းအရာကို ကူးယူရန် တောင်းခံနိုင်သည်။ သာမန် appများ သုံးရန် မဟုတ်ပါ။"</string>
<string name="permlab_route_media_output" msgid="1642024455750414694">"မီဒီယာထွက်ပေါက်အား လမ်းလွှဲပြောင်းခြင်း"</string>
@@ -1392,19 +1394,19 @@
<string name="permlab_control_keyguard" msgid="172195184207828387">"keyguard အား ပြသခြင်း ကွယ်ဖျောက်ခြင်းများအား ထိန်းချုပ်ခြင်း"</string>
<string name="permdesc_control_keyguard" msgid="3043732290518629061">"အပလီကေးရှင်း ကို keguard secure storage အား ထိန်းချုပ်ခွင့်ပေးခြင်း"</string>
<string name="permlab_trust_listener" msgid="1765718054003704476">"ယုံကြည်မှု အခြေအနေ ပြောင်းလဲမှုများကို စူးစမ်းခြင်း။"</string>
- <string name="permdesc_trust_listener" msgid="8233895334214716864">"အပလီကေးရှင်းအား ယုံကြည်မှု အခြေအနေ ထဲက အပြောင်းအလဲများကို စူးစမ်းခွင့် ပြုသည်။"</string>
- <string name="permlab_provide_trust_agent" msgid="5465587586091358316">"ယုံကြည်မှု အေဂျင့် စီစဉ်ပေးသည်။"</string>
- <string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"အပလီကေးရှင်းအား ယုံကြည်မှု အေဂျင့် စီစဉ်ခွင့် ပေးသည်။"</string>
- <string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"ယုံကြည်ရ အေဂျင့် ဆက်တင် မီနူး ဖွင့်တင်ပါ။"</string>
- <string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"အပလီကေးရှင်း တစ်ခုအား ယုံကြည်ရ အေဂျင့်၏ ပြုမူပုံကို ပြောင်းလဲစေနိုင်သည့် လှုပ်ရှားမှု တစ်ခုကို ဖွင့်တင်ခွင့် ပြုသည်။"</string>
- <string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"ယုံကြည်မှု အေဂျင့် ဝန်ဆောင်မှု တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
- <string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"စွဲကိုင်ထားသူအား ယုံကြည်မှု အေဂျင့် ဝန်ဆောင်မှုသို့ ချိတ်တွဲခွင့်ကို ပေးသည်။"</string>
+ <string name="permdesc_trust_listener" msgid="8233895334214716864">"အပလီကေးရှင်းအား ယုံကြည်မှု အခြေအနေ ထဲက အပြောင်းအလဲများကို စူးစမ်းခွင့် ပြုသည်။"</string>
+ <string name="permlab_provide_trust_agent" msgid="5465587586091358316">"ယုံကြည်မှု အေဂျင့် စီစဉ်ပေးသည်။"</string>
+ <string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"အပလီကေးရှင်းအား ယုံကြည်မှု အေဂျင့် စီစဉ်ခွင့် ပေးသည်။"</string>
+ <string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"ယုံကြည်ရ အေဂျင့် ဆက်တင် မီနူး ဖွင့်တင်ပါ။"</string>
+ <string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"အပလီကေးရှင်း တစ်ခုအား ယုံကြည်ရ အေဂျင့်၏ ပြုမူပုံကို ပြောင်းလဲစေနိုင်သည့် လှုပ်ရှားမှု တစ်ခုကို ဖွင့်တင်ခွင့် ပြုသည်။"</string>
+ <string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"ယုံကြည်မှု အေဂျင့် ဝန်ဆောင်မှု တစ်ခုဆီသို့ ချိတ်တွဲခြင်း"</string>
+ <string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"စွဲကိုင်ထားသူအား ယုံကြည်မှု အေဂျင့် ဝန်ဆောင်မှုသို့ ချိတ်တွဲခွင့်ကို ပေးသည်။"</string>
<string name="permlab_recovery" msgid="3157024487744125846">"အဆင့်မြှင့်ခြင်းနဲ့ ပြန်လည် ထိန်းသိမ်းခြင်း များနှင့် ဆက်ဆံစေခြင်း"</string>
<string name="permdesc_recovery" msgid="8511774533266359571">"အပလီကေးရှင်းအား စစ်စတန်အား ပြန်လည် ကယ်ဆယ်မှု နဲ့ အဆင့်မြှင့်ခြင်းများအား လုပ်ဆောင်ခွင့် ပေးခြင်း"</string>
<string name="permlab_createMediaProjection" msgid="4941338725487978112">"မီဒီယာ အနာဂတ် ချိတ်ဆက်မှုများကို ဖန်တီးရန်"</string>
- <string name="permdesc_createMediaProjection" msgid="1284530992706219702">"အပလီကေးရှင်း တစ်ခုအား မီဒီယာ အနာဂတ် ချိတ်ဆက်မှုများကို ဖန်တီးခွင့် ပြုသည်။ ယင်း ချိတ်ဆက်မှုများ ထဲမှာ အပလီကေးရှင်းအား ပြသမှု နှင့် အသံ အကြောင်းအရာများကို ဖမ်းယူခွင့် ပေးနိုင်သည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။."</string>
+ <string name="permdesc_createMediaProjection" msgid="1284530992706219702">"အပလီကေးရှင်း တစ်ခုအား မီဒီယာ အနာဂတ် ချိတ်ဆက်မှုများကို ဖန်တီးခွင့် ပြုသည်။ ယင်း ချိတ်ဆက်မှုများ ထဲမှာ အပလီကေးရှင်းအား ပြသမှု နှင့် အသံ အကြောင်းအရာများကို ဖမ်းယူခွင့် ပေးနိုင်သည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။."</string>
<string name="permlab_readInstallSessions" msgid="6165432407628065939">"တပ်ဆင်ရေး ချိတ်ဆက်မှုများကို ဖတ်ရန်"</string>
- <string name="permdesc_readInstallSessions" msgid="2049771699626019849">"အပလီကေးရှင်းအား တပ်ဆင်ရေး ချိတ်ဆက်မှုများကို ဖတ်ခွင့်ပြုသည်။ ၎င်းသည် ဖွင့်သုံးနေသည့် အထုပ်အား တပ်ဆင်မှုဆိုင်ရာ အသေးိစတ်များကို ကြည့်ရှုခွင့် ပြုသည်။"</string>
+ <string name="permdesc_readInstallSessions" msgid="2049771699626019849">"အပလီကေးရှင်းအား တပ်ဆင်ရေး ချိတ်ဆက်မှုများကို ဖတ်ခွင့်ပြုသည်။ ၎င်းသည် ဖွင့်သုံးနေသည့် အထုပ်အား တပ်ဆင်မှုဆိုင်ရာ အသေးိစတ်များကို ကြည့်ရှုခွင့် ပြုသည်။"</string>
<string name="tutorial_double_tap_to_zoom_message_short" msgid="4070433208160063538">"ချုံ့ချဲ့မှုကို ထိန်းချုပ်ရန် အတွက် နှစ်ကြိမ် ထိပါ"</string>
<string name="gadget_host_error_inflating" msgid="4882004314906466162">"ဝဒ်ဂျက်ထည့်လို့ မရပါ"</string>
<string name="ime_action_go" msgid="8320845651737369027">"သွားပါ"</string>
@@ -1415,9 +1417,9 @@
<string name="ime_action_previous" msgid="1443550039250105948">"အနောက်သို့"</string>
<string name="ime_action_default" msgid="2840921885558045721">"လုပ်ဆောင်ချက်"</string>
<string name="dial_number_using" msgid="5789176425167573586">\n"အား အသုံးပြု၍ <xliff:g id="NUMBER">%s</xliff:g>နံပါတ်ခေါ်ဆိုပါ"</string>
- <string name="create_contact_using" msgid="4947405226788104538">\n"အား အသုံးပြု၍<xliff:g id="NUMBER">%s</xliff:g>ဆက်သွယ်မည့်သူများအား ဖန်တီးခြင်း"</string>
- <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"အောက်ပါထဲက app တစ်ခု သို့မဟုတ် ပိုလျက် သင်၏ အကောင့်ကို၊ ယခု နှင့် အနာဂတ်မှာ ရယူအသုံးချရန် ခွင့်ပြုချက်ကို တောင်းထားသည်။"</string>
- <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"ဤတောင်းခံမှုအားခွင့်ပြုမည်လား"</string>
+ <string name="create_contact_using" msgid="4947405226788104538">\n"အား အသုံးပြု၍<xliff:g id="NUMBER">%s</xliff:g>ဆက်သွယ်မည့်သူများအား ဖန်တီးခြင်း"</string>
+ <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"အောက်ပါထဲက app တစ်ခု သို့မဟုတ် ပိုလျက် သင်၏ အကောင့်ကို၊ ယခု နှင့် အနာဂတ်မှာ ရယူအသုံးချရန် ခွင့်ပြုချက်ကို တောင်းထားသည်။"</string>
+ <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"ဤတောင်းခံမှုအားခွင့်ပြုမည်လား"</string>
<string name="grant_permissions_header_text" msgid="6874497408201826708">"သုံးစွဲခွင့် တောင်းဆိုရန်"</string>
<string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string>
<string name="deny" msgid="2081879885755434506">"ငြင်းပယ်သည်"</string>
@@ -1425,7 +1427,7 @@
<string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"အကောင့် <xliff:g id="ACCOUNT">%s</xliff:g> အတွက် \n ခွင့်ပြုချက် တောင်းခံထားပြီး"</string>
<string name="forward_intent_to_owner" msgid="570916783072215572">"သင်သည် ဒီappကို သင်၏ ကိုယ်ရေး နေရာထဲမှာ သုံးနေသည်။"</string>
<string name="forward_intent_to_work" msgid="8624579696577525279">"သင်သည် ဒီappကို သင်၏ အလုပ် နေရာထဲမှာ သုံးနေသည်။"</string>
- <string name="input_method_binding_label" msgid="1283557179944992649">"ထည့်သွင်းရန်နည်းလမ်း"</string>
+ <string name="input_method_binding_label" msgid="1283557179944992649">"ထည့်သွင်းရန်နည်းလမ်း"</string>
<string name="sync_binding_label" msgid="3687969138375092423">"ထပ်တူ ကိုက်ညီခြင်း"</string>
<string name="accessibility_binding_label" msgid="4148120742096474641">"အသုံးပြုခွင့်"</string>
<string name="wallpaper_binding_label" msgid="1240087844304687662">"နောက်ခံ"</string>
@@ -1441,12 +1443,12 @@
<string name="vpn_lockdown_error" msgid="6009249814034708175">"အမြဲတမ်းဖွင့်ထား VPN အမှား"</string>
<string name="vpn_lockdown_config" msgid="6415899150671537970">"ပြင်ဆင်ရန် ထိလိုက်ပါ"</string>
<string name="upload_file" msgid="2897957172366730416">"ဖိုင်ရွေးချယ်ရန်"</string>
- <string name="no_file_chosen" msgid="6363648562170759465">"မည်သည့်ဖိုင်ကိုမှမရွေးပါ"</string>
+ <string name="no_file_chosen" msgid="6363648562170759465">"မည်သည့်ဖိုင်ကိုမှမရွေးပါ"</string>
<string name="reset" msgid="2448168080964209908">"ပြန်လည်စတင်စေရန်"</string>
- <string name="submit" msgid="1602335572089911941">"တင်ပြရန်"</string>
+ <string name="submit" msgid="1602335572089911941">"တင်ပြရန်"</string>
<string name="car_mode_disable_notification_title" msgid="3164768212003864316">"ကားထဲတွင်အသုံးပြုနိုင်သောစနစ် ရရှိနိုင်သည်"</string>
<string name="car_mode_disable_notification_message" msgid="8035230537563503262">"ကားပေါ်ရောက် အခြေအနေမှ ထွက်ရန် ထိလိုက်ပါ"</string>
- <string name="tethered_notification_title" msgid="3146694234398202601">"တဆင့်ပြန်လည်လွှင့်ခြင်း သို့မဟုတ် ဟော့စပေါ့ ဖွင့်ထားသည်"</string>
+ <string name="tethered_notification_title" msgid="3146694234398202601">"တဆင့်ပြန်လည်လွှင့်ခြင်း သို့မဟုတ် ဟော့စပေါ့ ဖွင့်ထားသည်"</string>
<string name="tethered_notification_message" msgid="6857031760103062982">"အပြင်အဆင်ပြုလုပ်ရန် ပိုမိုသိနားလည်စေရန် တို့ထိပါ။"</string>
<string name="back_button_label" msgid="2300470004503343439">"နောက်သို့"</string>
<string name="next_button_label" msgid="1080555104677992408">"နောက်"</string>
@@ -1481,14 +1483,14 @@
<string name="gpsNotifMessage" msgid="1374718023224000702">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)မှတောင်းခံသည်"</string>
<string name="gpsVerifYes" msgid="2346566072867213563">"ဟုတ်သည်"</string>
<string name="gpsVerifNo" msgid="1146564937346454865">"မဟုတ်ပါ"</string>
- <string name="sync_too_many_deletes" msgid="5296321850662746890">"ပယ်ဖျက်မည့်ကန့်သတ်နှုန်းကျော်လွန်သည်"</string>
+ <string name="sync_too_many_deletes" msgid="5296321850662746890">"ပယ်ဖျက်မည့်ကန့်သတ်နှုန်းကျော်လွန်သည်"</string>
<string name="sync_too_many_deletes_desc" msgid="496551671008694245">"<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>၊ account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> အတွက် စုစုပေါင်း <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> အရာဖျက်ထားပါသည်။ သင်ဘာလုပ်ချင်ပါလဲ?"</string>
<string name="sync_really_delete" msgid="2572600103122596243">"ဤအရာများကိုဖျက်ပါ"</string>
<string name="sync_undo_deletes" msgid="2941317360600338602">"ဖျက်ပီးသည်များကို ပယ်ဖျက်ရန်"</string>
<string name="sync_do_nothing" msgid="3743764740430821845">"လက်ရှိ ဘာမှမလုပ်ရန်"</string>
- <string name="choose_account_label" msgid="5655203089746423927">"အကောင့် တစ်ခု ရွေးပါ"</string>
- <string name="add_account_label" msgid="2935267344849993553">"အကောင့် ထပ်ဖြည့်ပါ"</string>
- <string name="add_account_button_label" msgid="3611982894853435874">"အကောင့်ထပ်ထည့်ရန်"</string>
+ <string name="choose_account_label" msgid="5655203089746423927">"အကောင့် တစ်ခု ရွေးပါ"</string>
+ <string name="add_account_label" msgid="2935267344849993553">"အကောင့် ထပ်ဖြည့်ပါ"</string>
+ <string name="add_account_button_label" msgid="3611982894853435874">"အကောင့်ထပ်ထည့်ရန်"</string>
<string name="number_picker_increment_button" msgid="2412072272832284313">"တိုးရန်"</string>
<string name="number_picker_decrement_button" msgid="476050778386779067">"လျှော့ရန်"</string>
<string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> ကြာကြာ ဖိ ကိုင်ထားပါ"</string>
@@ -1510,15 +1512,15 @@
<string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Altခလုတ်"</string>
<string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"ပယ်ဖျက်ရန်ခလုတ်"</string>
<string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်ခလုတ်"</string>
- <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string>
+ <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string>
<string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"စနစ်ပြောင်းခြင်းခလုတ်"</string>
<string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shiftခလုတ်"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enterခလုတ်"</string>
<string name="activitychooserview_choose_application" msgid="2125168057199941199">"app တစ်ခုကို ရွေးရန်"</string>
<string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ကို စတင်လို့ မရပါ"</string>
<string name="shareactionprovider_share_with" msgid="806688056141131819">"မျှဝေဖို့ ရွေးပါ"</string>
- <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>နှင့် မျှဝေပါမည်"</string>
- <string name="content_description_sliding_handle" msgid="415975056159262248">"ဆွဲယူနိုင်သည့် လက်ကိုင်။ ထိပါ & ကိုင်ထားပါ။"</string>
+ <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>နှင့် မျှဝေပါမည်"</string>
+ <string name="content_description_sliding_handle" msgid="415975056159262248">"ဆွဲယူနိုင်သည့် လက်ကိုင်။ ထိပါ & ကိုင်ထားပါ။"</string>
<string name="description_target_unlock_tablet" msgid="3833195335629795055">"သော့ဖွင့်ရန် ပွတ်ဆွဲပါ"</string>
<string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"စကားဝှက်ပြောဆိုမှုကို ကြားနိုင်ရန် မိုက်ခွက်ပါနားကြပ် တပ်ပြီး နားထောင်ပါ"</string>
<string name="keyboard_password_character_no_headset" msgid="2859873770886153678">"ဒေါ့"</string>
@@ -1529,7 +1531,7 @@
<string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s ၊ %2$s ၊ %3$s"</string>
<string name="storage_internal" msgid="4891916833657929263">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
<string name="storage_sd_card" msgid="3282948861378286745">"SD ကဒ်"</string>
- <string name="storage_usb" msgid="3017954059538517278">"USBဖြင့် သိမ်းဆည်း"</string>
+ <string name="storage_usb" msgid="3017954059538517278">"USBဖြင့် သိမ်းဆည်း"</string>
<string name="extract_edit_menu_button" msgid="8940478730496610137">"ပြင်ဆင်ရန်"</string>
<string name="data_usage_warning_title" msgid="1955638862122232342">"ဒေတာအသုံးပြုမှုသတိပေးချက်"</string>
<string name="data_usage_warning_body" msgid="2814673551471969954">"ဆက်တင်နှင့်သုံးစွဲမှုကြည့်ရန်ထိပါ"</string>
@@ -1537,13 +1539,13 @@
<string name="data_usage_4g_limit_title" msgid="7476424187522765328">"4G ဒေတာ ပိတ်ထား"</string>
<string name="data_usage_mobile_limit_title" msgid="3393439305227911006">"ဆယ်လူလာ ဒေတာ ပိတ်ထား"</string>
<string name="data_usage_wifi_limit_title" msgid="3461968509557554571">"ကြိုးမဲ့ ဒေတာ ပိတ်ထား"</string>
- <string name="data_usage_limit_body" msgid="6131350187562939365">"ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string>
+ <string name="data_usage_limit_body" msgid="6131350187562939365">"ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string>
<string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"သတ်မှတ်ထားသော2G-3Gဒေတာအားကျော်လွန်နေသည်"</string>
<string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"သတ်မှတ်ထားသော4Gဒေတာအားကျော်လွန်နေသည်"</string>
- <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"ဆယ်လူလာ ကန့်သတ်ချက် ကျော်လွန်သွားပြီ"</string>
+ <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"ဆယ်လူလာ ကန့်သတ်ချက် ကျော်လွန်သွားပြီ"</string>
<string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"သတ်မှတ်ဝိုင်ဖိုင်ဒေတာထက်ကျော်နေ"</string>
<string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"သက်မှတ်နှုန်းထက် <xliff:g id="SIZE">%s</xliff:g> ကျော်နေပါသည်"</string>
- <string name="data_usage_restricted_title" msgid="5965157361036321914">"နောက်ခံဒေတာ ကန့်သတ်ထားသည်"</string>
+ <string name="data_usage_restricted_title" msgid="5965157361036321914">"နောက်ခံဒေတာ ကန့်သတ်ထားသည်"</string>
<string name="data_usage_restricted_body" msgid="6741521330997452990">"ကန့်သတ်ထားမှု ဖျက်ရန် ထိလိုက်ပါ"</string>
<string name="ssl_certificate" msgid="6510040486049237639">"လုံခြံုမှုဆိုင်ရာ အသိအမှတ်ပြုလက်မှတ်"</string>
<string name="ssl_certificate_is_valid" msgid="6825263250774569373">"ဤအသိအမှတ်ပြုလက်မှတ်မှာ တရားဝင်သည်"</string>
@@ -1561,7 +1563,7 @@
<string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 လက်ပွေ"</string>
<string name="activity_chooser_view_see_all" msgid="4292569383976636200">"အားလုံးကို ကြည့်ရန်"</string>
<string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"လှုပ်ရှားမှုကို ရွေးရန်"</string>
- <string name="share_action_provider_share_with" msgid="5247684435979149216">"...နှင့် မျှဝေရန်"</string>
+ <string name="share_action_provider_share_with" msgid="5247684435979149216">"...နှင့် မျှဝေရန်"</string>
<string name="list_delimeter" msgid="3975117572185494152">", "</string>
<string name="sending" msgid="3245653681008218030">"ပေးပို့နေစဉ်…"</string>
<string name="launchBrowserDefault" msgid="2057951947297614725">"ဘရောက်ဇာ ဖွင့်မည်လား။"</string>
@@ -1636,14 +1638,14 @@
<string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"သင် ပုံဖော်၍သော့ဖွင့်ခြင်းကို <xliff:g id="NUMBER_0">%d</xliff:g> အကြိမ် မှန်ကန်စွာ မပြုလုပ်နိုင်ပါ။ နောက်ထပ် <xliff:g id="NUMBER_1">%d</xliff:g> အကြိမ် မမှန်ကန်ပါက သင့်ဖုန်းအား အီးမေးလ်အသုံးပြု၍ သော့ဖွင့်ရန် တောင်းဆိုပါလိမ့်မည်။ \n\n <xliff:g id="NUMBER_2">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်လည် ကြိုးစားပါ"</string>
<string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string>
<string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"ဖယ်ရှားရန်"</string>
- <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"အသံကို အကြံပြုထားသည့် ပမာဏထက် မြှင့်ပေးရမလား?\n\nအသံကို မြင့်သည့် အဆင့်မှာ ကြာရှည်စွာ နားထောင်ခြင်းက သင်၏ နားကို ထိခိုက်စေနိုင်သည်။"</string>
+ <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"အသံကို အကြံပြုထားသည့် ပမာဏထက် မြှင့်ပေးရမလား?\n\nအသံကို မြင့်သည့် အဆင့်မှာ ကြာရှည်စွာ နားထောင်ခြင်းက သင်၏ နားကို ထိခိုက်စေနိုင်သည်။"</string>
<string name="continue_to_enable_accessibility" msgid="1626427372316070258">"လက်နှစ်ချောင်းကို ထိကိုင်ထားခြင်းဖြင့် သုံးစွဲနိုင်မှုကို ခွင့်ပြုပါ"</string>
<string name="accessibility_enabled" msgid="1381972048564547685">"သုံးစွဲခွင့် ကို ဖွင့်ထားသည်"</string>
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"အသုံးပြုခွင့် ဖျက်လိုက်သည်"</string>
<string name="user_switched" msgid="3768006783166984410">"လက်ရှိအသုံးပြုနေသူ <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="owner_name" msgid="2716755460376028154">"ပိုင်ရှင်"</string>
<string name="error_message_title" msgid="4510373083082500195">"အမှား"</string>
- <string name="error_message_change_not_allowed" msgid="1347282344200417578">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
+ <string name="error_message_change_not_allowed" msgid="1347282344200417578">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
<string name="app_not_found" msgid="3429141853498927379">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အပလီကေးရှင်း မရှိပါ။"</string>
<string name="revoke" msgid="5404479185228271586">"ပယ်ဖျက်ရန်"</string>
<string name="mediasize_iso_a0" msgid="1994474252931294172">"အိုက်အက်စ်အို အေ ဝ"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ခုရွေးချယ်ထားပြီး"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ကို ဖျက်ပြီးပါပြီ"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"အလုပ် <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"သင်သည် app-သို့ သော့ခတ် မုဒ်ထဲမှာ ရှိနေသည်။ ၎င်းထဲမှ ထွက်ရန် အတွက်၊ မကြာမီတုန်းက ခလုတ်ကို ထိလျက် ကိုင်ထားပါ"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"သင်သည် ကိရိယာဖြင့်သော့ခတ် မုဒ်ထဲမှာ ရှိနေသည်။"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"lock-to-app ကို သုံးမလား?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"app-သို့ သော့ခတ်မှုသည် ပြကွက်ကို app တစ်ခုတည်း ထဲတွင် သော့ခတ်ပေးသည်။\n\n ၎င်းထဲမှ ထွက်ရန် အတွက်၊ မကြာမီတုန်းက ခလုတ်ကို ထိလျက် ကိုင်ထားပါ။"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"မလို၊ ကျေးဇူးပါပဲ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"စတင်ရန်"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"appသို့ သော့ခတ်ထား"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"appသို့ ချိတ်ဆက် မထားတော့ပါ"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"မထွက်ခင် %1$s ကို မေးရန်"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
- <string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"သော့ဖွင့် ပုံစံဒီဇိုင်း"</string>
+ <string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"သော့ဖွင့် ပုံစံဒီဇိုင်း"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"စကားဝှက်"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"တီဗီ ဆိုင်ရာ မိဘများ အတွက် လမ်းညွှန်ချက်များ"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"သွယ်ဝိုက် အပြန်အလှန်ဆွေးနွေးမှု (အများအားဖြင့် လိင်ဆက်ဆံမှု အကြောင်း ပြောဆိုမှုများ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ကြမ်းတမ်းသော စကားလုံးများ"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"လိင်ဆက်ဆံမှု အကြောင်းအရာ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"အကြမ်းဖက်မှု"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"စိတ်ကူးယဉ် အကြမ်းဖက်မှု (ကလေးများ အတွက် အစီအစဉ်များသာလျှင်)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index a53e9fb..0073ad1 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Tillater appen å åpne eksternlagring for alle brukere."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"bruke bufrede filer"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Lar appen lese og skrive til det bufrede filsystemet."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"foreta/motta SIP-anrop"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Tillater at appen utfører og mottar SIP-anrop."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"samhandle med skjermen for innkommende anrop"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Lar appen styre når og hvordan brukeren ser skjermbildet for innkommende anrop."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"lese tidligere nettverksbruk"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Lar appen lese tidligere nettverksbruk for bestemte nettverk og apper."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"administrer retningslinjene for nettverk"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> er valgt"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> er slettet"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Jobb-<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Du er i lås-til-appen-modus. For å avslutte, trykker og holder du på Sist brukt-knappen"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Lås til app-modusen er aktivert."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Vil du bruke lås-til-app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Lås-til-appen låser skjermen i en enkelt app.\n\nFor å avslutte, trykker og holder du på Sist brukt-knappen."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEI, TAKK"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Låst til appen"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Ikke lenger låst til app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Spør etter %1$s før du avslutter"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-kode"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"opplåsingsmønster"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"passord"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Veiledende aldersgrenser for TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Usømmelig dialog (sikter gjerne til sexprat)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Grovt språk"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Seksuelt innhold"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Vold"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Vold i fantasy-programmer (bare i barneprogrammer)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml
index d453e48..eb9c066 100644
--- a/core/res/res/values-ne-rNP/strings.xml
+++ b/core/res/res/values-ne-rNP/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"अनुप्रयोगलाई सबै उपयोगकर्ताहरूको लागि बाह्य भण्डारणमाथि पहुँच राख्न अनुमति दिन्छ।"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"क्यास फाइल प्रणाली पहुँच गर्नुहोस्।"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"केस फाइल प्रणालीलाई पढ्न र लेख्नको लागि अनुप्रयोगलाई अनुमति दिन्छ।"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP कलहरू प्राप्त/बनाउन"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP कलहरू बनाउन र प्राप्त गर्न अनुप्रयोगलाई अनुमति दिन्छ।"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"आगमन कल स्क्रिनसँग अन्तर्क्रिया गर्नुहोस्"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"कहिले र कसरी प्रयोगकर्ताले आगमन कल स्क्रीन हेर्न सक्दछ भनेर नियन्त्रण गर्न अनुप्रयोगलाई अनुमति दिनुहोस्।"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"नेटवर्क उपयोगको इतिहास पढ्नुहोस्"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"निश्चित नेटवर्कहरू र अनुप्रयोगहरूको लागि ऐतिहासिक नेटवर्क उपयोग पढ्नको लागि अनुप्रयोगलाई अनुमति दिन्छ।"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"नेटवर्क नीति प्रबन्ध गर्नुहोस्"</string>
@@ -1772,532 +1774,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> चयन गरियो"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> हटाइयो"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्य <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"तपाईँ अनुप्रयोग बन्द गर्ने ढाँचामा हुनुहुन्छ। निस्कनका लागि हालैको अनुप्रयोगहरूका बटन थिच्नुहोस् र समाउनुहोस्।"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"तपाईं Lock-to-App मोडमा हुनुहुन्छ।"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"लक-देखि-अनुप्रयोग प्रयोग गर्ने?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"लक-गर्न अनुप्रयोगले एकल अनुप्रयोगमा प्रदर्शन बन्द गर्छ।\n\n,निस्कनका लागि हालैको अनुप्रयोगहरूका बटन थिच्नुहोस् र समाउनुहोस्।"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"होइन, धन्यवाद"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"अनुप्रयोग बन्द"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"अनुप्रयोग अब बन्द छैन"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for lock_to_app_use_screen_lock (1434584309048590886) -->
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
<skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"शैली बन्द गर्नुहोस"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"पासवर्ड"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"टिभी अभिभावक दिशानिर्देश"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"सुझावित संवाद (सामान्यतया अर्थ यौनबारे वार्ता )"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"भद्दा भाषा"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"यौन सामग्री"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"हिंसा"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"कल्पनिक हिंसा (बाल कार्यक्रम मात्र)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 79c1773..5b0c5f4 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Hiermee krijgt de app toegang tot externe opslag van alle gebruikers."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"het cachebestandssysteem openen"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Hiermee kan de app het cachebestandssysteem lezen en schrijven."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP-oproepen plaatsen/ontvangen"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Toestaan dat de app SIP-oproepen plaatst en ontvangt."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interactie met scherm in actieve oproep"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Hiermee kan de app bepalen wanneer en hoe de gebruiker het scherm in een actieve oproep te zien krijgt."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"historisch netwerkgebruik lezen"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Hiermee kan de app historisch netwerkgebruik voor specifieke netwerken en apps lezen."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"netwerkbeleid beheren"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> geselecteerd"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> verwijderd"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Werk <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"U bevindt zich in de App-slotmodus. Blijf de knop \'Recente apps\' aanraken om de modus te beëindigen."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"U bevindt zich in de App-slotmodus."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"App-slot gebruiken?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Met het App-slot wordt het scherm vergrendeld in één app.\n\nAls u dit wilt beëindigen, blijft u de knop \'Recente apps\' aanraken."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEE, BEDANKT"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Vergrendeld in app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Niet meer vergrendeld in app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Vragen om %1$s voordat u afsluit"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"pincode"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ontgrendelingspatroon"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"wachtwoord"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"De Kijkwijzer"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Suggestieve gesprekken (houdt meestal in dat er over seks wordt gepraat)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Grof taalgebruik"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Pornografische inhoud"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Geweld"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fictief geweld (alleen kinderprogramma\'s)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index e6137df..65616c2 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Pozwala aplikacji na dostęp do zewnętrznej pamięci masowej dla wszystkich użytkowników."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"dostęp do systemu plików pamięci podręcznej"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Pozwala aplikacji na odczyt i zapis w systemie plików pamięci podręcznej."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"wykonywanie/odbieranie połączeń SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Pozwala aplikacji na wykonywanie i odbieranie połączeń SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakcje z ekranem połączenia"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Zezwala aplikacji na kontrolowanie, kiedy i w jaki sposób użytkownik widzi ekran połączenia."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"odczyt historii wykorzystania sieci"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Pozwala aplikacji na odczyt historii wykorzystania określonych sieci przez poszczególne aplikacje."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"zarządzanie zasadami dotyczącymi sieci"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Wybrałeś <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> usunięte"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (praca)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Jesteś w trybie Zablokuj na aplikacji. Aby wyjść, naciśnij i przytrzymaj przycisk Ostatnie."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Jesteś w trybie Zablokuj na aplikacji."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Chcesz użyć funkcji Zablokuj na aplikacji?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Gdy włączysz Zablokuj na aplikacji, na ekranie będzie się wyświetlać pojedyncza aplikacja.\n\nAby wyłączyć tę funkcję, kliknij i przytrzymaj przycisk Ostatnie."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NIE, DZIĘKUJĘ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"START"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Zablokuj na aplikacji"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Zablokowanie na aplikacji zostało wyłączone"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Przed wyjściem pytaj o %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Kod PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"wzór odblokowania"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"hasło"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Wskazówki TV dla rodziców"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dwuznaczne dialogi (zazwyczaj oznacza to rozmowy o seksie)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Wulgarny język"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Treści pornograficzne"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Przemoc"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Nierealistyczna przemoc (tylko programy dla dzieci)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 4b1d582..b54d6c0 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite que a aplicação aceda ao armazenamento externo para todos os utilizadores."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"aceder ao sistema de ficheiros da cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite à aplicação ler e escrever no sistema de ficheiros da cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"efetuar/receber chamadas SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite que a aplicação efetue e receba chamadas SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interagir com o ecrã durante uma chamada"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite que a aplicação controle quando e como o utilizador vê o ecrã durante uma chamada."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ler utilização histórica da rede"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite que a aplicação leia utilização histórica da rede para redes e aplicações específicas."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gerir a política de rede"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> selecionado"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabalho"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Está no modo Bloquear numa aplicação. Para sair, toque sem soltar no botão Recentes"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Está no modo Lock-to-App."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Utilizar o Lock-to-app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Bloquear numa aplicação bloqueia o ecrã numa única aplicação.\n\nPara sair, toque sem soltar no botão Recentes."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NÃO, OBRIGADO"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INICIAR"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Bloqueado numa aplicação"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Já não está bloqueado numa aplicação"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Solicitar %1$s antes de sair"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"sequência de desbloqueio"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"palavra-passe"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"As diretrizes parentais de TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diálogo sugestivo (normalmente significa falar de sexo)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Linguagem grosseira"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Conteúdo de natureza sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violência"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violência fantástica (apenas programação infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 5bb3d8c..5c3e589 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite que o aplicativo acesse o armazenamento externo para todos os usuários."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"acessar o sistema de arquivos de cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite que o aplicativo leia e grave o sistema de arquivos cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"fazer/receber chamadas SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite que o app faça e receba chamadas SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interagir com chamada na tela"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite que o aplicativo controle quando e como o usuário visualiza a chamada na tela."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ler histórico de uso da rede"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite que o aplicativo leia o histórico de uso da rede para redes e aplicativos específicos."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gerenciar a política de rede"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> selecionado"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> excluído"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Trabalho: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"O modo fixar no app está ativado. Para sair, toque e mantenha pressionado o botão \"Recentes\""</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Você está no modo Fixar no app."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Usar Fixar no app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Fixar no app bloqueia a exibição em um único aplicativo.\n\nPara sair, toque e mantenha pressionado o botão \"Recentes\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NÃO, OBRIGADO"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"INICIAR"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Fixar no app ativado"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Fixar no app desativado"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Solicitar a %1$s antes de sair"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"desbloquear padrão"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"senha"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Diretrizes da TV para os pais"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Diálogo sugestivo (geralmente diz respeito a conversas sobre sexo)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Linguagem vulgar"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Conteúdo sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violência"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violência fantasiosa (apenas para programação infantil)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index dc88a5c..325c0a9 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"ID apelant de primire"</string>
<string name="ClirMmi" msgid="7784673673446833091">"ID apelant"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"ID-ul liniei conectate"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Restricționarea ID-ului liniei conectate"</string>
<string name="CfMmi" msgid="5123218989141573515">"Redirecţionarea apelurilor"</string>
<string name="CwMmi" msgid="9129678056795016867">"Apel în aşteptare"</string>
<string name="BaMmi" msgid="455193067926770581">"Blocarea apelurilor"</string>
@@ -668,12 +666,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"permiteți conectarea aplicației prin Bluetooth"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Permite aplicației să se conecteze la dispozitive de la distanță, fără intervenția utilizatorului."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Permite aplicației să se conecteze la dispozitive de la distanță, fără intervenția utilizatorului."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"accesarea datelor MAP Bluetooth"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Permite aplicației să acceseze datele MAP Bluetooth."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Permite aplicației să acceseze datele MAP Bluetooth."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"se conectează şi se deconectează de la WiMAX"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite aplicaţiei să stabilească dacă o reţea WiMAX este activată şi să vadă informaţiile cu privire la toate reţelele WiMAX conectate."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Schimbaţi starea WiMAX"</string>
@@ -719,12 +714,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Permite aplicaţiei să acceseze stocarea externă pentru toţi utilizatorii."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"accesare sistem de fişiere cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Permite aplicaţiei să scrie şi să citească sistemul de fişiere cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"efectuarea/primirea apelurilor SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Permite aplicației să efectueze și să primească apeluri SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interacțiune cu ecranul în timpul unui apel"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Permite aplicației să controleze când și cum vede utilizatorul ecranul în timpul unui apel."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"citeşte utilizarea statistică a reţelei"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite aplicaţiei să citească utilizarea statistică a reţelei pentru anumite reţele şi aplicaţii."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gestionează politica de reţea"</string>
@@ -921,20 +918,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"Cardul SIM lipseşte sau nu poate fi citit. Introduceţi un card SIM."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Card SIM inutilizabil."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Cardul dvs. SIM este dezactivat definitiv.\n Contactaţi furnizorul de servicii wireless pentru a obţine un alt card SIM."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Melodia anterioară"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Melodia următoare"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Pauză"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Redați"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Opriți"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Derulaţi"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Derulaţi rapid înainte"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Numai apeluri de urgenţă"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Reţea blocată"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Cardul SIM este blocat cu codul PUK."</string>
@@ -1513,10 +1503,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Reduceţi valoarea pentru oră"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Setaţi valoarea PM"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Setaţi valoarea AM"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"PM"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"AM"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"Creşteţi valoarea pentru lună"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Reduceţi valoarea pentru lună"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"Creşteţi valoarea pentru zi"</string>
@@ -1778,530 +1766,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> selectat"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> a fost șters"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de serviciu"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Sunteți în modul Blocare la aplicație. Apăsați lung pe butonul Recente pentru a ieși."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Sunteți în modul Blocare la aplicație."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Utilizați Blocarea la aplicație?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Blocarea la aplicație blochează ecranul într-o singură aplicație.\n\nPentru a ieși, apăsați lung pe butonul Recente."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NU, MULȚUMESC"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"PORNIȚI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Blocat la aplicație"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"S-a anulat blocarea la aplicație"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Se solicită %1$s înainte de închidere"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"model pentru deblocare"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"parolă"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Ghid TV destinat părinților"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialog sugestiv (de obicei, discuții despre sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Limbaj dur"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Conţinut sexual"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Violență"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Violență ficțională (numai programe pentru copii)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index ac46af9..632bdda 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"Идентификация вызывающего абонента"</string>
<string name="ClirMmi" msgid="7784673673446833091">"Идентификация звонящего абонента"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"Идентификатор подключенной линии"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Ограничение идентификатора подключенной линии"</string>
<string name="CfMmi" msgid="5123218989141573515">"Переадресация вызова"</string>
<string name="CwMmi" msgid="9129678056795016867">"Параллельный вызов"</string>
<string name="BaMmi" msgid="455193067926770581">"Запрет вызовов"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Приложение сможет обращаться к внешним накопителям из всех аккаунтов."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"Доступ к файловой системе кэша"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Приложение сможет выполнять чтение и запись в файловую систему кэша."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"Входящие и исходящие вызовы SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Разрешить вызовы по протоколу SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"Управление экраном во время разговора"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Приложение сможет управлять экраном во время разговора."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"Просмотр журнала использования сети"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Приложение сможет считывать сохраненную историю использования определенных сетей и приложений."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"Управление сетевой политикой"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM-карта отсутствует или недоступна. Вставьте SIM-карту."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"SIM-карта непригодна к использованию."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"SIM-карта окончательно заблокирована.\nЧтобы получить новую, обратитесь к своему оператору."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Предыдущий трек"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Следующий трек"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Приостановить"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Воспроизвести"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Остановить"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Перемотать назад"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Перемотать вперед"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Только экстренные вызовы"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Сеть заблокирована"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-карта заблокирована с помощью кода PUK."</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"На час назад"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Установить время после полудня"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Установить время до полудня"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"PM"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"АМ"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"На месяц вперед"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"На месяц назад"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"На день вперед"</string>
@@ -1775,530 +1766,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Выбран элемент <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Цифра <xliff:g id="KEY">%1$s</xliff:g> удалена"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Рабочий <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Включена блокировка в приложении. Чтобы отключить ее, нажмите и удерживайте кнопку недавних приложений."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Включена блокировка в приложении"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Использовать блокировку в приложении?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Эта функция блокирует переход в другие приложения.\n\nЧтобы отключить блокировку, нажмите и удерживайте кнопку недавних приложений."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"НЕТ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ДА"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Блокировка в приложении включена"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Блокировка в приложении отключена"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Запрашивать %1$s перед выходом"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-код"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"графический ключ"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"пароль"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Рейтинг TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Содержание непристойного характера (обсуждение сексуальных вопросов)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Обсценная лексика"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Нагота"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Насилие"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Фантастика со сценами насилия (только программы для детей)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml
index 71ac4f8..8db3349 100644
--- a/core/res/res/values-si-rLK/strings.xml
+++ b/core/res/res/values-si-rLK/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"පැමිණෙන අමතන්නාගේ ID"</string>
<string name="ClirMmi" msgid="7784673673446833091">"පිටතට යන අමතන්නාගේ ID"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"සම්බන්ධ කළ Line ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"සම්බන්ධ කළ Line ID සීමා කිරීම්"</string>
<string name="CfMmi" msgid="5123218989141573515">"ඇමතුම ඉදිරියට යැවීම"</string>
<string name="CwMmi" msgid="9129678056795016867">"ඇමතුම් රැඳීම"</string>
<string name="BaMmi" msgid="455193067926770581">"ඇමතුම අවහිර කිරීම"</string>
@@ -666,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"යෙදුම මගින් බ්ලූටූත් යුගල කිරීම ඉඩ දෙන්න"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"පරිශීලක අන්තර්ක්රියාවෙන් තොරව දුරස්ථ උපාංග සමග යුගල වීමට උපාංගයට ඉඩ දෙයි."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"පරිශීලක අන්තර්ක්රියාවෙන් තොරව දුරස්ථ උපාංග සමග යුගල වීමට උපාංගයට ඉඩ දෙයි."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"බ්ලූටූත් MAP දත්ත ප්රවේශ කරන්න"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"බ්ලූටූත් MAP දත්ත ප්රවේශ කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"බ්ලූටූත් MAP දත්ත ප්රවේශ කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX වෙතට සම්බන්ධ කරන්න හෝ විසන්ධි කරන්න"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"WiMAX සබල බව සහ සම්බන්ධිත ඕනෑම WiMAX ජාලයක තොරතුරු නිශ්චය කිරීමට යෙදුමට අවසර දෙයි."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"WiMAX තත්වය වෙනස් කරන්න"</string>
@@ -717,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"සියලු පරිශීලකයන් සඳහා බාහිර ආචයනය වෙත පිවිසීමට යෙදුමට අවසර දෙන්න."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"හැඹිලි ගොනු පද්ධතියට ප්රවේශ වීම"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"හැඹිලි ගොනු පද්ධති කියවීමට සහ ලිවීමට යෙදුමට අවසර දෙන්න."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP ඇමතුම් සිදුකිරීමට/ලබාගැනීමට"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ඇමතුම් සිදුකිරීමට සහ ලබාගැනීමට යෙදුමට ඉඩ දෙන්න."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ලැබෙන ඇමතුම් තිරය සමග අන්තර් ක්රියාකාරී වන්න"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ලැබෙන ඇමතුම් තිරය පරිශීලකයාට පෙනෙන්නේ කෙදිනද සහ කෙසේද යැයි පාලනය කිරීමට යෙදුමට අවසර දෙන්න."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"ඉතිහාසගත ජාල භාවිතය කියවන්න"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"විශේෂිත ජාල සහ යෙදුම් සඳහා ඉතිහාසගත ජාල භාවිතය කියවීමට යෙදුමට අවසර දෙන්න."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ජාල ප්රතිපත්තිය කළමනාකරණය කිරීම"</string>
@@ -919,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM පත නොමැත හෝ කියවිය නොහැක. SIM පතක් ඇතුලත් කරන්න."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"භාවිතා කළ නොහැකි SIM පත."</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"ඔබගේ SIM පත ස්ථිරව අබල කර තිබේ.\n වෙනත් SIM පතක් සඳහා ඔබගේ සේවාදායකයා සම්බන්ධ කරගන්න."</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"පෙර ගීතය"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"ඊළඟ ගීතය"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"විරාමය"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"ධාවනය කරන්න"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"නතර කරන්න"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"නැවත ඔතන්න"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"වේගයෙන් ඉදිරියට යන"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"හදිසි ඇමතුම් පමණි"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"ජාලය අගුළු දමා ඇත"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM පත PUK අගුළු දමා ඇත."</string>
@@ -1242,7 +1232,7 @@
<string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> යෙදුම (<xliff:g id="PROCESS">%2$s</xliff:g> ක්රියාවලිය) එහි StrictMode කොන්දේසිය උල්ලංඝනය කර ඇත."</string>
<string name="smv_process" msgid="5120397012047462446">"<xliff:g id="PROCESS">%1$s</xliff:g> ක්රියාවලිය එහි StrictMode කොන්දේසිය උල්ලංඝනය කර ඇත."</string>
<string name="android_upgrading_title" msgid="1584192285441405746">"Android උත්ශ්රේණි වෙමින් පවතී..."</string>
- <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> කින් <xliff:g id="NUMBER_0">%1$d</xliff:g> වැනි යෙදුමප් රශස්ත කරමින්."</string>
+ <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> කින් <xliff:g id="NUMBER_0">%1$d</xliff:g> වැනි යෙදුම ප්රශස්ත කරමින්."</string>
<string name="android_upgrading_starting_apps" msgid="451464516346926713">"යෙදුම් ආරම්භ කරමින්."</string>
<string name="android_upgrading_complete" msgid="1405954754112999229">"ඇරඹුම අවසාන කරමින්."</string>
<string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> ධාවනය වෙමින්"</string>
@@ -1412,7 +1402,7 @@
<string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"විශ්වාසවන්ත නියෝජිතයෙක් සැපයීමට අවසර දෙන්න."</string>
<string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"විශ්වාසනීය නියෝජිතයාගේ සැකසීම් මෙනුව දියත් කරන්න."</string>
<string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"විශ්වාසනීය නියෝජිතයාගේ හැසිරීම වෙනස් කරන ක්රියාකරමක් දියත් කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
- <string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"විශ්වාසනීය ඒජන්ත සේවාවකට බැඳීම"</string>
+ <string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"විශ්වාසවන්ත නියෝජිත සේවාවකට බැඳීම"</string>
<string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"යෙදුමකට විශ්වාසනීය ඒජන්ත සේවාවකට බැඳීමට අවසර දේ."</string>
<string name="permlab_recovery" msgid="3157024487744125846">"ප්රතිසාධන පද්ධතිය සහ යාවත්කාලීන සමඟ කටයුතු කරන්න"</string>
<string name="permdesc_recovery" msgid="8511774533266359571">"යෙදුමකට ප්රතිසාධන පද්ධතිය සහ පද්ධති යාවත්කාලීන සමඟ කටයුතු කිරීමට ඉඩ දෙන්න."</string>
@@ -1514,10 +1504,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"පැය අඩුකරන්න"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"ප.ව.සකසන්න"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"පෙ.ව. සකස් කිරීම"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"ප.ව."</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"පෙ.ව."</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"මාසය වැඩි කරන්න"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"මාසයක් අඩු කරන්න"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"දවස වැඩි කරන්න"</string>
@@ -1779,530 +1767,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> තෝරාගෙන ඇත"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> මකා දමන ලදි"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"වැඩ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"යෙදුමට-අඟුළු දැමීමේ ආකාරය තුළ ඔබ සිටි. පිටවීමට, මෑත යෙදුම් බොත්තම ඔබා අල්ලා ගෙන සිටින්න"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"යෙදුමට-අඟුළු දැමීමේ ආකාරය තුළ ඔබ සිටි."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"අගුළු-යෙදුම භාවිතා කරන්නද?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"අගුළු-යෙදුම තනි යෙදුමක පෙනුම අගුළු දමයි.\n\nඉවත්ව යාමට මෑත යෙදුම් බොත්තම ඔබා රඳවා ගන්න"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"නැත, ස්තූතියි"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ආරම්භය"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"යෙදුමට-අඟුළු දැමීම"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"යෙදුමට අඟුළු දැමීම තවදුරටත් නැත"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"පිටවීමට පෙර %1$s සඳහා ආසන්න"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"අඟුළු ඇරීමේ රටාව"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"මුරපදය"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"දෙමාපිය රූපවාහිනී මාර්ගෝපදේශ"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"කාමුක සංවාදය (සාමාන්යයෙන් ලිංගත්වය පිළිබඳ කථා කිරීම අදහස් වේ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"රළු භාෂාව"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"ලිංගිකත්වය හඟවන අන්තර්ගතය"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ප්රචණ්ඩත්වය"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"මනස්සෘෂ්ටිය ප්රචණ්ඩත්වය (ළමයින්ට පමණක් වැඩසටහන් කිරීම)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 702e12c..e561d9b 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Umožňuje aplikácii pristupovať k externému ukladaciemu priestoru pre všetkých používateľov."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"pristupovať do súborového systému vyrovnávacej pamäte"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Umožňuje aplikácii čítať a zapisovať do súborového systému vyrovnávacej pamäte."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"uskutočňovanie/príjem hovorov SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Umožňuje aplikácii uskutočňovať a prijímať hovory SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakcia s obrazovkou hovoru"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Umožňuje aplikácii ovládať, kedy a ako sa používateľovi zobrazí obrazovka hovoru."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"čítať históriu používania siete"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Umožňuje aplikácii čítať históriu používania siete pre určité siete a aplikácie."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"spravovať pravidlá siete"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Bola vybratá položka <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Číslo <xliff:g id="KEY">%1$s</xliff:g> bolo odstránené"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Práca – <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Nachádzate sa v režime uzamknutia v aplikácii. Tento režim ukončíte stlačením a podržaním tlačidla nedávnych aplikácií."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Nachádzate sa v režime Uzamknutie v aplikácii."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Použiť Uzamknutie v aplikácii?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Uzamknutie v aplikácii uzamkne displej na zobrazovanie jednej aplikácie.\n\nTento režim ukončíte stlačením a podržaním tlačidla nedávnych aplikácií."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NIE, ĎAKUJEM"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"SPUSTIŤ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Uzamknutie v aplikácii"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Uzamknutie v aplikácii bolo ukončené"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Pred ukončením požiadať o %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Číslo PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"bezpečnostný vzor"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"heslo"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Pokyny pre rodičovský dohľad pre TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Naznačujúci dialóg (zvyčajne ide o konverzácie o sexe)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Hrubý jazyk"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Sexuálny obsah"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Násilie"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantazijné násilie (iba detské programy)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index b334813..462dc19 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"aplikaciji dovoli seznanjanje prek povezave Bluetooth"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Aplikaciji dovoljuje seznanjanje z oddaljenimi napravami brez interakcije uporabnika."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Aplikaciji dovoljuje seznanjanje z oddaljenimi napravami brez interakcije uporabnika."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"dostop do podatkov za Bluetooth MAP"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Aplikaciji omogoča dostop do podatkov za Bluetooth MAP."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Aplikaciji omogoča dostop do podatkov za Bluetooth MAP."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"vzpostavitev povezave z omrežjem WiMax in prekinitev povezave z njim"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Aplikaciji omogoča, da ugotovi, ali je WiMAX omogočen, in ogled podatkov o povezanih omrežjih WiMAX."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"Sprememba stanja omrežja WiMAX"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Aplikaciji omogoča dostop do zunanje naprave za shranjevanje za vse uporabnike."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"dostop do datotečnega sistema predpomnilnika"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Programu omogoča branje in pisanje v datotečni sistem predpomnilnika."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"opravljanje/sprejemanje klicev SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Aplikaciji omogoča opravljanje in sprejemanje klicev SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interakcija z zaslonom pri klicu"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Aplikaciji omogoča nadzor nad tem, kdaj in kako uporabnik vidi zaslon pri klicu."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"branje prejšnje uporabe omrežja"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Programu omogoča branje pretekle uporabe omrežja za določena omrežja in programe."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"upravljanje pravilnika o omrežju"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Izbrano: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Številka <xliff:g id="KEY">%1$s</xliff:g> je izbrisana"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> za delo"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Ste v načinu zaklepanja v aplikacijo. Če ga želite zapustiti, se dotaknite gumba »Nedavno« in ga pridržite."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Ste v načinu zaklepanja v aplikacijo."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Želite uporabiti zaklepanje v aplikacijo?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Zaklepanje v aplikacijo zaklene zaslon v eni aplikaciji.\n\nČe želite zapustiti ta način, se dotaknite gumba »Nedavno« in ga pridržite."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NE, HVALA"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ZAŽENI"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Zaklenjeno v aplikacijo"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Zaklepanje v aplikacijo izklopljeno"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Pred izhodom zahtevaj %1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"vzorec za odklepanje"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"geslo"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Smernice za ocenjevanje TV-vsebine"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Sugestivni dialog (običajno pomeni pogovor o seksu)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Grobo izražanje"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Prizori spolnosti"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Nasilje"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantazijsko nasilje (samo za otroške oddaje)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 8dc4bbe..c11e1ff 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Дозвољава апликацији да приступа спољној меморији за све кориснике."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"приступ систему датотека кеша"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Дозвољава апликацији да чита систем датотека кеша и уписује податке у њега."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"упућивање/пријем SIP позива"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Омогућава апликацији да упућује и прима SIP позиве."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"интеракција са екраном током позива"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Дозвољава апликацији да контролише када и како се кориснику приказује екран приликом позива."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"чита историју коришћења мреже"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Дозвољава апликацији да чита историју коришћења мреже за посебне мреже и апликације."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"управљање смерницама за мрежу"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Изабрали сте <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Избрисали сте <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> на послу"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Налазите се у режиму Закључавање апликације. Да бисте изашли, притисните и задржите дугме Недавне апликације"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Користите режим Закључавање на апликацију."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Желите ли да користите Закључај на апликацију?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Функција Закључавање апликације закључава приказ на једну апликацију.\n\nДа бисте изашли, додирните и задржите дугме Недавне апликације."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"НЕ, ХВАЛА"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ПОКРЕНИ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Закључано је на апликацију"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Није више закључано на апликацију"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Захтевај %1$s пре изласка из режима"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"шаблон за откључавање"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"лозинка"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"ТВ смернице за родитеље"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Сугестивни дијалог (обично значи разговоре о сексу)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Непристојан језик"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Сексуални садржај"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Насиље"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Нереално насиље (само у дечијим емисијама)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 7aa887a..9115c06 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"tillåt Bluetooth-koppling för appen"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Tillåter att appen kopplas till fjärrenheter utan interaktion med användare."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Tillåter att appen kopplas till fjärrenheter utan interaktion med användare."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"tillgång till Bluetooth MAP-uppgifter"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Tillåter att appen får åtkomst till Bluetooth MAP-uppgifter."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Tillåter att appen får åtkomst till Bluetooth MAP-uppgifter."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"ansluta till och koppla från WiMAX"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Tillåter att appen avgör om WiMAX är aktiverat och kommer åt information om eventuella anslutna WiMAX-nätverk."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"ändra WiMAX-status"</string>
@@ -719,6 +716,10 @@
<string name="permdesc_use_sip" msgid="2297804849860225257">"Tillåter att appen gör och tar emot SIP-anrop."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"interagera med skärmen för inkommande samtal"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Låter appen kontrollera hur och när användaren ser skärmen för inkommande samtal."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"läsa historisk nätverksanvändning"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Tillåter att appen läser den historiska nätverksanvändningen för specifika nätverk och appar."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"hantera nätverkspolicy"</string>
@@ -1763,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> har markerats"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> har tagits bort"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> för arbetet"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Läget Lås till app används. Avsluta genom att trycka länge på knappen för de senaste apparna"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Läget Lås till app används."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Vill du använda Lås till app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Med funktionen Lås till app låses skärmen i en enskild app.\n\nAvsluta genom att trycka länge på knappen för de senaste apparna."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"NEJ TACK"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"STARTA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Låst till app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Inte längre låst till app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Fråga efter %1$s innan läget avslutas"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Pinkod"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"grafiskt lösenord"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"lösenord"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV-riktlinjer för föräldrar"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Dialog med provokativt innehåll (innebär vanligen att den berör sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Grovt språk"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Sexuellt innehåll"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Våld"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantasyvåld (endast barnprogram)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index a9e5f0a..177730c 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Inaruhusu programu kufikia hifadhi ya nje kwa watumiaji wote."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"fikia faili za mfumo za akiba"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Huruhusu programu kusoma na kuandika mfumo wa faili wa akiba."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"piga/pokea simu za SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ruhusu programu ipige na kupokea simu za SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"tumikisha skrini ya simu inayoendelea"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Huruhusu programu kudhibiti wakati na jinsi mtumiaji anaona skrini anapopigiwa simu."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"soma matumizi ya historia ya mtandao"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Inaruhusu programu kusoma historia ya matumizi ya mtandao kwa mitandao maalum na programu."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"dhibiti sera ya mtandao"</string>
@@ -918,7 +920,7 @@
<string name="lockscreen_transport_next_description" msgid="573285210424377338">"Wimbo unaofuata"</string>
<string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Sitisha"</string>
<string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Cheza"</string>
- <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Acha"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Simamisha"</string>
<string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Rudisha nyuma"</string>
<string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Peleka mbele kwa kasi"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"Simu za dharura pekee"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> kimechaguliwa"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> kimefutwa"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Ya kazini <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Upo katika hali ya salia katika programu moja. Ili uondoke, gusa na ushikilie kitufe cha Programu za hivi majuzi"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Uko katika hali ya Kusalia katika Programu Moja."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Ungependa kutumia kipengele cha kusalia katika programu moja?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Salia katika programu moja hufunga onyesho katika programu moja. \n \n Ili uondoke, gusa na ushikilie kitufe cha Programu za hivi majuzi."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"HAPANA, ASANTE"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ANZA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Inasalia katika programu moja"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Haisalii katika programu moja tena"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Uliza %1$s kabla hujaondoka"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"mchoro wa kufungua"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"nenosiri"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Mwongozo wa Wazazi wa Televisheni"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Mazungumzo yenye kuchochea ngono (Kwa kawaida humaanisha mazungumzo kuhusu ngono)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Lugha ya matusi"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Maudhui ya ngono"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Vurugu"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Vurugu za dhahania (Ratiba ya watoto pekee)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml
index d9f4eba..a72e813 100644
--- a/core/res/res/values-ta-rIN/strings.xml
+++ b/core/res/res/values-ta-rIN/strings.xml
@@ -186,7 +186,7 @@
<string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"விமானப் பயன்முறை"</string>
<string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"விமானப் பயன்முறை இயக்கத்தில் உள்ளது"</string>
<string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"விமானப் பயன்முறை முடக்கத்தில் உள்ளது"</string>
- <string name="global_action_settings" msgid="1756531602592545966">"அமைப்புகள்"</string>
+ <string name="global_action_settings" msgid="1756531602592545966">"அமைப்பு"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"இப்போது பூட்டு"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
<string name="safeMode" msgid="2788228061547930246">"பாதுகாப்பு பயன்முறை"</string>
@@ -207,7 +207,7 @@
<string name="permgroupdesc_network" msgid="4478299413241861987">"வெவ்வேறு நெட்வொர்க் அம்சங்களை அணுகுதல்."</string>
<string name="permgrouplab_bluetoothNetwork" msgid="1585403544162128109">"புளூடூத்"</string>
<string name="permgroupdesc_bluetoothNetwork" msgid="5625288577164282391">"புளூடூத் மூலமாக சாதனங்கள் மற்றும் நெட்வொர்க்குகளை அணுகவும்."</string>
- <string name="permgrouplab_audioSettings" msgid="8329261670151871235">"ஆடியோ அமைப்புகள்"</string>
+ <string name="permgrouplab_audioSettings" msgid="8329261670151871235">"ஆடியோ அமைப்பு"</string>
<string name="permgroupdesc_audioSettings" msgid="2641515403347568130">"ஆடியோ அமைப்புகளை மாற்றவும்."</string>
<string name="permgrouplab_affectsBattery" msgid="6209246653424798033">"பேட்டரியைப் பாதிக்கும்"</string>
<string name="permgroupdesc_affectsBattery" msgid="6441275320638916947">"விரைவில் பேட்டரியைத் தீர்க்கும் அம்சங்களைப் பயன்படுத்தவும்."</string>
@@ -237,7 +237,7 @@
<string name="permgroupdesc_systemClock" msgid="3944359833624094992">"சாதனத்தின் நேரம் அல்லது நேரமண்டலத்தை மாற்றவும்."</string>
<string name="permgrouplab_statusBar" msgid="2095862568113945398">"நிலைப் பட்டி"</string>
<string name="permgroupdesc_statusBar" msgid="6242593432226807171">"சாதனத்தின் நிலைப் பட்டி அமைப்புகளை மாற்றவும்."</string>
- <string name="permgrouplab_syncSettings" msgid="3341990986147826541">"ஒத்திசைவு அமைப்புகள்"</string>
+ <string name="permgrouplab_syncSettings" msgid="3341990986147826541">"ஒத்திசைவு அமைப்பு"</string>
<string name="permgroupdesc_syncSettings" msgid="7603195265129031797">"ஒத்திசைவு அமைப்புகளுக்கான அணுகல்."</string>
<string name="permgrouplab_accounts" msgid="3359646291125325519">"உங்கள் கணக்குகள்"</string>
<string name="permgroupdesc_accounts" msgid="4948732641827091312">"கிடைக்கும் கணக்குகளை அணுக முடியும்."</string>
@@ -468,9 +468,9 @@
<string name="permlab_setPreferredApplications" msgid="8463181628695396391">"விருப்ப பயன்பாடுகளை அமைத்தல்"</string>
<string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"உங்களுக்கு விருப்பமான பயன்பாடுகளை மாற்ற, பயன்பாட்டை அனுமதிக்கிறது. தீங்குவிளைவிக்கும் பயன்பாடுகள், இயங்குகின்ற பயன்பாடுகளை அறிவிப்பு இல்லாமல் மாற்றலாம், உங்களிடமிருந்து தனிப்பட்ட தரவைச் சேகரிக்க, ஏற்கனவே உள்ள பயன்பாடுகளை ஏமாற்றலாம்."</string>
<string name="permlab_writeSettings" msgid="2226195290955224730">"முறைமை அமைப்புகளை மாற்றுதல்"</string>
- <string name="permdesc_writeSettings" msgid="7775723441558907181">"முறைமையின் அமைப்புகள் தரவைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. தீங்குவிளைவிக்கும் பயன்பாடுகள், முறைமையின் உள்ளமைவைச் சிதைக்கலாம்."</string>
+ <string name="permdesc_writeSettings" msgid="7775723441558907181">"முறைமையின் அமைப்பு தரவைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. தீங்குவிளைவிக்கும் பயன்பாடுகள், முறைமையின் உள்ளமைவைச் சிதைக்கலாம்."</string>
<string name="permlab_writeSecureSettings" msgid="204676251876718288">"பாதுகாப்பான கணினி அமைப்புகளை மாற்று"</string>
- <string name="permdesc_writeSecureSettings" msgid="8159535613020137391">"முறைமையின் பாதுகாப்பு அமைப்புகள் தரவைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. சாதாரண பயன்பாடுகளுக்கு பயன்படாது."</string>
+ <string name="permdesc_writeSecureSettings" msgid="8159535613020137391">"முறைமையின் பாதுகாப்பு அமைப்பு தரவைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. சாதாரண பயன்பாடுகளுக்கு பயன்படாது."</string>
<string name="permlab_writeGservices" msgid="2149426664226152185">"Google சேவைகள் வரைபடத்தை மாற்றுதல்"</string>
<string name="permdesc_writeGservices" msgid="1287309437638380229">"Google சேவையகங்களின் வரைபடத்தைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. சாதாரண பயன்பாடுகளுக்கு பயன்படாது."</string>
<string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"தொடக்கத்தில் இயக்குதல்"</string>
@@ -643,7 +643,7 @@
<string name="permdesc_accessNetworkState" msgid="8318964424675960975">"தற்போது இருக்கும் நெட்வொர்க்குகள் எவை மற்றும் இணைக்கப்பட்டுள்ளவை எவை போன்ற நெட்வொர்க் இணைப்புகள் குறித்த தகவலைப் பார்க்கப் பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_createNetworkSockets" msgid="8018758136404323658">"முழுமையான நெட்வொர்க் அணுகல்"</string>
<string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"நெட்வொர்க் சாக்கெட்டுகளை உருவாக்கவும் மற்றும் தனிப்பயன் நெட்வொர்க் நெறிமுறைகளைப் பயன்படுத்தவும் பயன்பாட்டை அனுமதிக்கிறது. இணையத்தில் தரவை அனுப்ப உலாவியும், பிற பயன்பாடுகளும் இருப்பதால், இணையத்திற்குத் தரவை அனுப்ப இந்த அனுமதி தேவையில்லை."</string>
- <string name="permlab_writeApnSettings" msgid="505660159675751896">"பிணைய அமைப்புகள் மற்றும் ட்ராஃபிக்கை மாற்றுதல்/இடைமறித்தல்"</string>
+ <string name="permlab_writeApnSettings" msgid="505660159675751896">"பிணைய அமைப்பு மற்றும் ட்ராஃபிக்கை மாற்றுதல்/இடைமறித்தல்"</string>
<string name="permdesc_writeApnSettings" msgid="5333798886412714193">"நெட்வொர்க் அமைப்புகளை மாற்றவும், எல்லா நெட்வொர்க் ட்ராஃபிக்கையும் இடைநிறுத்தி கண்காணிக்கவும், பயன்பாட்டை அனுமதிக்கிறது. எடுத்துக்காட்டாக, ஏதேனும் APN இன் ப்ராக்ஸி மற்றும் போர்ட்டை மாற்றுதல் போன்றவை. உங்கள் அனுமதி இல்லாமல், நெட்வொர்க் பேக்கேஜ்களை தீங்குவிளைவிக்கும் பயன்பாடுகள் கண்காணிக்கலாம், திசைதிருப்பலாம் அல்லது மாற்றலாம்."</string>
<string name="permlab_changeNetworkState" msgid="958884291454327309">"பிணைய இணைப்புத்தன்மையை மாற்றுதல்"</string>
<string name="permdesc_changeNetworkState" msgid="6789123912476416214">"நெட்வொர்க் இணைப்பின் நிலையை மாற்ற, பயன்பாட்டை அனுமதிக்கிறது."</string>
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"அனைத்து பயனர்களும் வெளிப்புறச் சேமிப்பிடத்தை அணுகுவதற்குப் பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"தற்காலிகச் சேமிப்பு கோப்பு அமைப்பின் அணுகல்"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"தற்காலிகச் சேமிப்பு கோப்பு அமைப்பைப் படிக்க மற்றும் எழுத, பயன்பாட்டை அனுமதிக்கிறது."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP அழைப்புகளைச் செய்தல்/பெறுதல்"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP அழைப்புகளைச் செய்ய/பெற, பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"உள்வரும் அழைப்பிற்கான திரையுடன் ஊடாடுதல்"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"உள்வரும் அழைப்பிற்கான திரையைப் பயனர் எப்போது மற்றும் எப்படிக் காணவேண்டும் என்பதைக் கட்டுப்படுத்துவதற்குப் பயன்பாட்டை அனுமதிக்கிறது."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"பிணைய பயன்பாட்டு வரலாற்றைப் படித்தல்"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"குறிப்பிட்ட நெட்வொர்க்குகள் மற்றும் பயன்பாடுகளுக்கான நெட்வொர்க் பயன்பாட்டின் வரலாற்றைப் படிக்க, பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"பிணைய கொள்கையை நிர்வகித்தல்"</string>
@@ -1203,7 +1205,7 @@
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s மூலம் பகிர்"</string>
<string name="whichHomeApplication" msgid="4616420172727326782">"முகப்பு பயன்பாட்டைத் தேர்ந்தெடுக்கவும்"</string>
<string name="alwaysUse" msgid="4583018368000610438">"இந்தச் செயலுக்கு இயல்பாகப் பயன்படுத்து."</string>
- <string name="clearDefaultHintMsg" msgid="3252584689512077257">"முறைமை அமைப்புகள் > பயன்பாடுகள் > பதிவிறக்கியவை என்பதில் உள்ள இயல்பை அழிக்கவும்."</string>
+ <string name="clearDefaultHintMsg" msgid="3252584689512077257">"முறைமை அமைப்பு > பயன்பாடுகள் > பதிவிறக்கியவை என்பதில் உள்ள இயல்பை அழிக்கவும்."</string>
<string name="chooseActivity" msgid="7486876147751803333">"செயலைத் தேர்ந்தெடுக்கவும்"</string>
<string name="chooseUsbActivity" msgid="6894748416073583509">"USB சாதனத்திற்கான பயன்பாட்டைத் தேர்வுசெய்க"</string>
<string name="noApplications" msgid="2991814273936504689">"இந்தச் செயலைச் செய்ய பயன்பாடுகள் எதுவுமில்லை."</string>
@@ -1224,7 +1226,7 @@
<string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> உண்மையாக வெளியிடப்பட்டது."</string>
<string name="screen_compat_mode_scale" msgid="3202955667675944499">"அளவு"</string>
<string name="screen_compat_mode_show" msgid="4013878876486655892">"எப்போதும் காட்டு"</string>
- <string name="screen_compat_mode_hint" msgid="1064524084543304459">"சிஸ்டம் அமைப்புகள் > பயன்பாடுகள் > பதிவிறக்கம் என்பதில் இதை மீண்டும் இயக்கவும்."</string>
+ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"சிஸ்டம் அமைப்பு > பயன்பாடுகள் > பதிவிறக்கம் என்பதில் இதை மீண்டும் இயக்கவும்."</string>
<string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> பயன்பாடு (செயல்முறை <xliff:g id="PROCESS">%2$s</xliff:g>), தனது சுய-செயலாக்க StrictMode கொள்கையை மீறியது."</string>
<string name="smv_process" msgid="5120397012047462446">"<xliff:g id="PROCESS">%1$s</xliff:g> செயல்முறை, தனது சுய-செயலாக்க StrictMode கொள்கையை மீறியது."</string>
<string name="android_upgrading_title" msgid="1584192285441405746">"Android மேம்படுத்தப்படுகிறது…"</string>
@@ -1299,7 +1301,7 @@
<string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"அனுப்பு"</string>
<string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"ரத்துசெய்"</string>
<string name="sms_short_code_remember_choice" msgid="5289538592272218136">"எனது விருப்பத்தேர்வை நினைவில்கொள்"</string>
- <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"அமைப்புகள் > பயன்பாடுகள் என்பதில் பிறகு நீங்கள் மாற்றலாம்"</string>
+ <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"அமைப்பு > பயன்பாடுகள் என்பதில் பிறகு நீங்கள் மாற்றலாம்"</string>
<string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"எப்போதும் அனுமதி"</string>
<string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"ஒருபோதும் அனுமதிக்காதே"</string>
<string name="sim_removed_title" msgid="6227712319223226185">"SIM கார்டு அகற்றப்பட்டது"</string>
@@ -1395,7 +1397,7 @@
<string name="permdesc_trust_listener" msgid="8233895334214716864">"நம்பிக்கை நிலை மாற்றங்களைக் கவனிக்க பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_provide_trust_agent" msgid="5465587586091358316">"நம்பகமான ஏஜென்ட்டை வழங்குதல்."</string>
<string name="permdesc_provide_trust_agent" msgid="3865702641053068148">"நம்பகமான ஏஜென்ட்டை வழங்க, பயன்பாட்டை அனுமதிக்கிறது."</string>
- <string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"நம்பகமான ஏஜென்ட் அமைப்புகள் மெனுவைத் துவக்கு."</string>
+ <string name="permlab_launch_trust_agent_settings" msgid="5859430082240410200">"நம்பகமான ஏஜென்ட் அமைப்பு மெனுவைத் துவக்கு."</string>
<string name="permdesc_launch_trust_agent_settings" msgid="8185142708644913381">"நம்பகமான ஏஜென்ட் நடவடிக்கையை மாற்றுகின்ற செயல்பாட்டைத் துவக்குவதற்குப் பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_bind_trust_agent_service" msgid="8242093169457695334">"நம்பகமான ஏஜென்ட் சேவையுடன் இணைத்தல்"</string>
<string name="permdesc_bind_trust_agent_service" msgid="7041930026024507515">"நம்பகமான ஏஜென்ட் சேவையுடன் இணைப்பதற்குப் பயன்பாட்டை அனுமதிக்கிறது."</string>
@@ -1581,7 +1583,7 @@
<string name="media_route_chooser_title" msgid="1751618554539087622">"சாதனத்துடன் இணைக்கவும்"</string>
<string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"திரையிலிருந்து சாதனத்திற்கு அனுப்புக"</string>
<string name="media_route_chooser_searching" msgid="4776236202610828706">"சாதனங்களைத் தேடுகிறது..."</string>
- <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"அமைப்புகள்"</string>
+ <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"அமைப்பு"</string>
<string name="media_route_controller_disconnect" msgid="8966120286374158649">"துண்டி"</string>
<string name="media_route_status_scanning" msgid="7279908761758293783">"ஸ்கேன் செய்கிறது..."</string>
<string name="media_route_status_connecting" msgid="6422571716007825440">"இணைக்கிறது..."</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> நீக்கப்பட்டது"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"பணியிடம் <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"லாக்-டு-ஆப் பயன்முறையில் உள்ளது. வெளியேற, சமீபத்தியவை பட்டனை அழுத்திப் பிடிக்கவும்"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"லாக்-டு-ஆப் பயன்முறையில் உள்ளது."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"லாக்-டூ-ஆப்பைப் பயன்படுத்தவா?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"ஒற்றைப் பயன்பாட்டின் திரையை லாக்-டு-ஆப் பூட்டுகிறது.\n\nவெளியேற, சமீபத்தியவை பட்டனை அழுத்திப் பிடிக்கவும்."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"வேண்டாம், நன்றி"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"தொடங்கு"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"பயன்பாடு பூட்டப்பட்டது"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"பயன்பாடு பூட்டப்படவில்லை"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"வெளியேறுவதற்கு முன், %1$s க்காகக் கேள்"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"திறப்பதற்கான வடிவம்"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"கடவுச்சொல்"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"டிவி நிகழ்ச்சிகள் - பெற்றோர் வழிகாட்டல்கள்"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"பாலுணர்வைத் தூண்டும் வசனம் (பொதுவாகப் பாலுறவைப் பற்றி பேசுவது)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"கொச்சை மொழி"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"பாலியல் உள்ளடக்கம்"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"வன்முறை"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ஃபேண்டசி வன்முறை (குழந்தைகளுக்கான நிகழ்ச்சிகளில் மட்டும்)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml
index 6f42f78..e7e24f7 100644
--- a/core/res/res/values-te-rIN/strings.xml
+++ b/core/res/res/values-te-rIN/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"వినియోగదారులందరి కోసం బాహ్య నిల్వను ప్రాప్యత చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"కాష్ ఫైల్ సిస్టమ్ను ప్రాప్యత చేయడం"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"కాష్ ఫైల్సిస్టమ్ను చదవడానికి మరియు వ్రాయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP కాల్లను చేయడానికి/స్వీకరించడానికి"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP కాల్లను చేయడానికి మరియు స్వీకరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"ఇన్-కాల్ స్క్రీన్తో పరస్పర చర్య చేయడం"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"వినియోగదారుకు ఇన్-కాల్ స్క్రీన్ ఎప్పుడు, ఎలా కనిపించాలనే దాన్ని నియంత్రించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"చారిత్రక నెట్వర్క్ వినియోగాన్ని చదవడం"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"నిర్దిష్ట నెట్వర్క్లు మరియు అనువర్తనాలు కోసం చారిత్రాత్మక నెట్వర్క్ వినియోగాన్ని చదవడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"నెట్వర్క్ విధానాన్ని నిర్వహించడం"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> ఎంచుకోబడింది"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> తొలగించబడింది"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"కార్యాలయం <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"మీరు లాక్-టు-యాప్ మోడ్లో ఉన్నారు. నిష్క్రమించడానికి, ఇటీవలివి బటన్ని నొక్కి ఉంచండి"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"మీరు లాక్-టు-యాప్ మోడ్లో ఉన్నారు."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"లాక్-టు-యాప్ను ఉపయోగించాలా?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"లాక్-టు-యాప్ ఒకే అనువర్తనంలో డిస్ప్లేని లాక్ చేస్తుంది.\n\nనిష్క్రమించడానికి, ఇటీవలివి బటన్ని నొక్కి ఉంచండి."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"వద్దు, ధన్యవాదాలు"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ప్రారంభించు"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"అనువర్తనానికి లాక్ చేయబడింది"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"అనువర్తనానికి లాక్ చేయబడలేదు"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"నిష్క్రమించడానికి ముందు %1$s కోసం అడుగు"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"అన్లాక్ నమూనా"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"పాస్వర్డ్"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"టీవీ కార్యక్రమాల గురించి తల్లిదండ్రులకు అందించే మార్గదర్శకాలు"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"సరస సల్లాప సంభాషణ (మామూలుగా చెప్పాలంటే సంభోగం గురించిన సంభాషణలని అర్థం)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"అనాగరిక భాష"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"లైంగిక కంటెంట్"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"హింస"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"కాల్పనిక హింస (కేవలం పిల్లల కార్యక్రమాలు)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-television/themes.xml b/core/res/res/values-television/themes.xml
index f92ff40..a501fac 100644
--- a/core/res/res/values-television/themes.xml
+++ b/core/res/res/values-television/themes.xml
@@ -20,4 +20,6 @@
<style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
<style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />
<style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
+ <style name="Theme.Material.Dialog" parent="Theme.Leanback.Dialog" />
+ <style name="Theme.Material.Light.Dialog" parent="Theme.Leanback.Light.Dialog" />
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 9344321..b4a5fbe 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"อนุญาตให้แอปพลิเคชันเข้าถึงที่จัดเก็บข้อมูลภายนอกสำหรับผู้ใช้ทั้งหมด"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"เข้าถึงระบบไฟล์แคช"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"อนุญาตให้แอปพลิเคชันอ่านและเขียนระบบไฟล์แคช"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"โทร/รับสาย SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"อนุญาตให้แอปโทรและรับสาย SIP"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"โต้ตอบกับหน้าจอขณะกำลังใช้สาย"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"อนุญาตให้แอปควบคุมเวลาและลักษณะที่ผู้ใช้เห็นหน้าจอขณะกำลังใช้สาย"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"อ่านประวัติการใช้เครือข่าย"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"อนุญาตให้แอปพลิเคชันอ่านประวัติการใช้เครือข่ายสำหรับเครือข่ายและแอปพลิเคชันเฉพาะ"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"จัดการนโยบายเครือข่าย"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"เลือก <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"ลบ <xliff:g id="KEY">%1$s</xliff:g> แล้ว"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g>ที่ทำงาน"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"คุณกำลังอยู่ในโหมดการล็อกแอป หากต้องการออก ให้แตะปุ่ม \"ล่าสุด\" ค้างไว้"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"คุณกำลังใช้โหมดการล็อกแอป"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"ใช้การล็อกแอปไหม"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"การล็อกแอปจะล็อกการแสดงไว้ในแอปเดียว\n\nหากต้องการออก ให้แตะปุ่ม \"ล่าสุด\" ค้างไว้"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"ไม่เป็นไร ขอบคุณ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"เริ่มต้น"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"ล็อกแอปแล้ว"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"ไม่ล็อกแอปอีกต่อไป"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"ขอ %1$s ก่อนออก"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"รูปแบบการปลดล็อก"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"รหัสผ่าน"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV Parental Guidelines"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"บทสนทนามีการชี้นำทางเพศ (โดยทั่วไปหมายถึงการพูดถึงเรื่องทางเพศ)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"ภาษาหยาบคาย"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"เนื้อหาเกี่ยวกับเรื่องเพศ"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"ความรุนแรง"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"ความรุนแรงแบบแฟนตาซี (รายการสำหรับเด็กเท่านั้น)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index 8006116..bdb5172 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Pinapayagan ang app na mag-access ng panlabas na storage para sa lahat ng user."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"i-access ang cache filesystem"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Pinapayagan ang app na basahin at isulat ang cache filesystem."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"magsagawa/tumanggap ng mga tawag sa SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Pinapayagan ang app na magsagawa at makatanggap ng mga tawag sa SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"makipag-ugnayan sa in-call na screen"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Nagbibigay-daan sa app na kontrolin kung kailan at kung paano makikita ng user ang in-call na screen."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"basahin ang makasaysayang paggamit ng network"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Pinapayagan ang app na basahin ang makasaysayang paggamit network para sa mga tukoy na network at apps."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"pamahalaan ang patakaran ng network"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Napili ang <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Tinanggal ang <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> sa Trabaho"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Ikaw ay nasa lock-to-app mode. Upang lumabas, pindutin nang matagal ang button na Mga Kamakailang Ginamit."</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Ikaw ay nasa Lock-to-App mode."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Gagamitin ang lock-to-app?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Nila-lock ng lock-to-app ang display sa iisang app.\n\nUpang lumabas, pindutin nang matagal ang button na Mga Kamakailang Ginamit."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"HINDI, SALAMAT NA LANG"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"SIMULAN"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Naka-lock sa app"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Hindi na naka-lock sa app"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Humingi ng %1$s bago lumabas"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"pattern sa pag-unlock"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"password"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Ang Mga Parental Guideline sa TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"May ipinahihiwatig na usapan (Kadalasang nangangahulugang mga pag-uusap tungkol sa sex)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Magaspang na pananalita"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Sekswal na nilalaman"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Karahasan"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Karahasan na pang-fantasy (Mga programang pambata lang)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 85f5bbf..8f32ec5 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -664,12 +664,9 @@
<string name="permlab_bluetoothPriv" msgid="4009494246009513828">"Uygulama tarafından yapılan Bluetooth eşleştirmelerine izin ver"</string>
<string name="permdesc_bluetoothPriv" product="tablet" msgid="8045735193417468857">"Uygulamaya, kullanıcının müdahalesi olmadan uzak cihazlarla eşleştirme izni verir."</string>
<string name="permdesc_bluetoothPriv" product="default" msgid="8045735193417468857">"Uygulamaya, kullanıcının müdahalesi olmadan uzak cihazlarla eşleştirme izni verir."</string>
- <!-- no translation found for permlab_bluetoothMap (6372198338939197349) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
- <!-- no translation found for permdesc_bluetoothMap (5784090105926959958) -->
- <skip />
+ <string name="permlab_bluetoothMap" msgid="6372198338939197349">"Bluetooth MAP verilerine erişme"</string>
+ <string name="permdesc_bluetoothMap" product="tablet" msgid="5784090105926959958">"Uygulamanın Bluetooth MAP verilerine erişmesine izin verir."</string>
+ <string name="permdesc_bluetoothMap" product="default" msgid="5784090105926959958">"Uygulamanın Bluetooth MAP verilerine erişmesine izin verir."</string>
<string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX\'e bağlan veya WiMAX bağlantısını kes"</string>
<string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Uygulamaya, WiMAX\'in etkin olup olmadığını belirleme ve bağlı tüm WiMAX ağlarıyla ilgili bilgilere erişme izni verir."</string>
<string name="permlab_changeWimaxState" msgid="2405042267131496579">"WiMAX durumunu değiştir"</string>
@@ -715,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Uygulamaya tüm kullanıcılar için harici depolamaya erişim izni verir."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"önbellek dosya sistemine eriş"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Uygulamaya, önbellek dosya sisteminde okuma ve yazma yapma izni verir."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP çağrıları yapma/alma"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Uygulamanın SIP çağrıları yapmasına ve almasına izin verir."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"Çağrı ekranıyla etkileşimde bulun"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Uygulamaya, kullanıcının çağrı ekranını ne zaman ve nasıl göreceğini denetleme izni verir."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"geçmiş ağ kullanımını oku"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Uygulamaya, özel ağlar ve uygulamalar için ağ kullanım geçmişini okuma izni verir."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"ağ politikasını yönet"</string>
@@ -1765,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> seçildi"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> silindi"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (İş)"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Uygulamaya kilitleme modundasınız. Çıkmak için Son Uygulamalar düğmesine dokunun ve basılı tutun"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Uygulamaya Kilitleme modundasınız."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Uygulamaya Kilitleme özelliği kullanılsın mı?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Uygulamaya kilitleme, ekranı tek bir uygulamada kilitler\n\nÇıkmak için Son uygulamalar düğmesine dokunun ve basılı tutun."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"HAYIR, TEŞEKKÜRLER"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"BAŞLAT"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Uygulamaya kilitli"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Artık uygulamaya kilitli değil"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Çıkmadan önce %1$s iste"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"kilit açma deseni"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"şifre"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV Ebeveyn Yönergeleri"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Müstehcen diyalog (Genellikle cinsellik hakkında konuşmalar anlamına gelir)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Kaba dil"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Cinsel içerik"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Şiddet"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Fantezi şiddet (Sadece çocuklara yönelik programlar)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index 862dd2c..f7583d6 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Дозволяє програмі отримувати доступ до зовнішньої пам’яті всіх користувачів."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"отр. дост. до файл. сист. кешу"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Дозволяє програмі читати з файлової системи кеш-пам’яті та писати в неї."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"здійснювати й отримувати дзвінки через протокол SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Додаток зможе здійснювати й отримувати дзвінки через протокол SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"взаємодіяти з екраном вхідного виклику"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Дозволяє програмі контролювати, коли та як користувач бачить екран вхідного виклику."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"читати історію використання мережі"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Дозволяє програмі читати історію використання мережі для певних мереж і програм."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"керувати політикою мережі"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Вибрано: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> видалено"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Робоча <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Увімкнено режим блокування в додатку. Щоб його вимкнути, натисніть і утримуйте кнопку \"Останні додатки\""</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Увімкнено режим \"Блокування в додатку\"."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Використовувати блокування в додатку?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"У режимі блокування в додатку дисплей блокується в певному додатку.\n\nЩоб вимкнути цей режим, натисніть і утримуйте кнопку \"Останні додатки\"."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"НІ, ДЯКУЮ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"УВІМКНУТИ"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Блокування в додатку ввімкнено"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Блокування в додатку вимкнено"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Запитувати про \"%1$s\" перед вимкненням"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN-код"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"ключ розблокування"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"пароль"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Поради батькам щодо телепередач"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Непристойний діалог (зазвичай означає розмови про секс)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Вульгарні висловлювання"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Вміст сексуального характеру"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Насильство"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Вигадані історії зі сценами насильства (лише в дитячих передачах)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml
index d0dff0a..99534fd9 100644
--- a/core/res/res/values-ur-rPK/strings.xml
+++ b/core/res/res/values-ur-rPK/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"ایپ کو سبھی صارفین کیلئے خارجی اسٹوریج تک رسائی حاصل کرنے کی اجازت دیتا ہے۔"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"کیش فائل سسٹم تک رسائی حاصل کریں"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"ایپ کو کیش فائل سسٹم پڑھنے اور لکھنے کی اجازت دیتا ہے۔"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP کالز کریں/موصول کریں"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"ایپ کو SIP کالز کرنے اور موصول کرنے کی اجازت دیتا ہے۔"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"درون کال اسکرین کے ساتھ تعامل کریں"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"ایپ کو صارف کے درون کال اسکرین دیکھنے کے وقت اور طریقے کو کنٹرول کرنے کی اجازت دیتا ہے۔"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"تاریخی نیٹ ورک کا استعمال پڑھیں"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"ایپ کو مخصوص نیٹ ورکس اور ایپس کیلئے نیٹ ورک کے استعمال کی سرگزشت پڑھنے کی اجازت دیتا ہے۔"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"نیٹ ورک کی پالیسی کا نظم کریں"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> کو منتخب کیا گیا"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> کو حذف کر دیا گیا"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"دفتر <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"آپ لاک ٹو ایپ وضع میں ہیں۔ باہر نکلنے کیلئے، حالیہ بٹن کو ٹچ کریں اور دبائیں رکھیں"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"آپ لاک ٹو ایپ وضع میں ہیں۔"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"لاک ٹو ایپ استعمال کریں؟"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"لاک ٹو ایپ کسی واحد ایپ میں ڈسپلے کو مقفل کر دیتی ہے۔\n\nباہر نکلنے کیلئے، حالیہ بٹن کو ٹچ کریں اور دبائے رکھیں۔"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"نہیں، شکریہ"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"شروع کریں"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"لاک ٹو ایپ میں ہیں"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"مزید لاک ٹو ایپ میں نہیں ہیں"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"باہر نکلنے سے پہلے %1$s کا مطالبہ کریں"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"غیر مقفل کرنے کا پیٹرن"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"پاس ورڈ"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV کی والدین کیلئے رہنما ہدایات"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"ترغیب آمیز بات چیت (عام طور پر اس کا مطلب جنس کے بارے میں بات چیتیں ہوتی ہے)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"غیر مہذب زبان"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"جنسی مواد"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"تشدد"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"افسانوی تشدد (صرف بچوں کی پروگرامنگ)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml
index 2b06748..206b2fc5 100644
--- a/core/res/res/values-uz-rUZ/strings.xml
+++ b/core/res/res/values-uz-rUZ/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Ilovalarga barcha foydalanuvchilar uchun tashqi xotiraga kirish uchun ruxsat beradi."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"fayl tizimi keshiga kirish"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Ilova kesh fayl tizimini o‘qishi va unga yozishi mumkin."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"SIP qo‘ng‘iroqlarini amalga oshirish/qabul qilish"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ilovaga SIP qo‘ng‘iroqlarini amalga oshirish va qabul qilish uchun ruxsat beradi."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"kiruvchi qo‘ng‘iroq ekrani bilan ishlash"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Dasturga kirish qo‘ng‘irog‘ini foydalanuvchi qachon va qanday ko‘rishini boshqarishga ruxsat beradi."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"tarixiy tarmoq sarfi ma‘lumotlarini o‘qish"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Ilova muayyan tarmoqlardan va ilovalardan foydalanish tarixini o‘qishi mumkin."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"tarmoq siyosatini boshqarish"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"<xliff:g id="ITEM">%1$s</xliff:g> tanlandi"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> o‘chirildi"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Ish <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Siz yagona ilova rejimidasiz. Chiqish uchun So‘nggi foydalanilgan ilovalar tugmasini biroz bosib turing"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Siz Yagona ilova rejimidasiz."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Yagona ilova rejimi yoqilsinmi?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Yagona ilova rejimi ekranni qulflab, faqat bitta ilovadan foydalanishga ruxsat beradi.\n\nUshbu rejimdan chiqish uchun Sso‘nggi foydalanilgan ilovalar tugmasini biroz bosib turing."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"YO‘Q, KERAK EMAS"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"ISHGA TUSHIRISH"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Yagona ilova rejimi faollashtirildi"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Yagona ilova rejimidan chiqildi"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Chiqishdan oldin “%1$s” so‘ralsin"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN kod"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"qulfdan chiqarish chizmasi"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"parol"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"TV ota-ona nazorati"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Jiddiy suhbat (odatda, seks haqidagi suhbatlar)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Qo‘pol muomala"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Shahvoniy tasvirlar"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Zo‘ravonlik"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Zo‘ravonlik fantaziyalari (Faqat bolalar uchun mo‘ljallangan dasturlar)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index 2184b9a..7428d89 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Cho phép ứng dụng truy cập bộ nhớ ngoài của tất cả người dùng."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"truy cập hệ thống tệp bộ nhớ cache"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Cho phép ứng dụng đọc và ghi hệ thống tệp bộ nhớ cache."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"thực hiện/nhận các cuộc gọi qua SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Cho phép ứng dụng thực hiện và nhận các cuộc gọi qua SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"tương tác với màn hình trong cuộc gọi"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Cho phép ứng dụng kiểm soát thời gian và cách người dùng nhìn thấy màn hình trong cuộc gọi."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"đọc quá trình sử dụng mạng trước đây"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Cho phép ứng dụng đọc thông tin lịch sử sử dụng mạng của các mạng và ứng dụng cụ thể."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"quản lý chính sách mạng"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"Đã chọn <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"Đã xóa <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> làm việc"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Bạn đang ở chế độ khóa trong ứng dụng. Để thoát, chạm và giữ nút Gần đây"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Bạn đang ở chế độ Khóa trong ứng dụng."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Sử dụng Khóa trong ứng dụng?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Tính năng khóa trong ứng dụng khóa màn hình trong một ứng dụng.\n\nĐể thoát, chạm và giữ nút Gần đây."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"KHÔNG, CẢM ƠN"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"BẮT ĐẦU"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Bị khóa trong ứng dụng"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Không còn bị khóa trong ứng dụng nữa"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Yêu cầu %1$s trước khi thoát"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"Mã PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"hình mở khóa"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"mật khẩu"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Chương trình TV cần xem dưới sự hướng dẫn của phụ huynh"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Hội thoại khiêu dâm (thường nói về tình dục)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Ngôn từ thô tục"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Nội dung khiêu dâm"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Bạo lực"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Hình ảnh bạo lực (chỉ lập trình cho trẻ em)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 13c7376..557f709 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -70,10 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"来电显示"</string>
<string name="ClirMmi" msgid="7784673673446833091">"本机号码"</string>
- <!-- no translation found for ColpMmi (3065121483740183974) -->
- <skip />
- <!-- no translation found for ColrMmi (4996540314421889589) -->
- <skip />
+ <string name="ColpMmi" msgid="3065121483740183974">"连接的线路ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"连接的线路ID限制"</string>
<string name="CfMmi" msgid="5123218989141573515">"来电转接"</string>
<string name="CwMmi" msgid="9129678056795016867">"来电等待"</string>
<string name="BaMmi" msgid="455193067926770581">"呼叫限制"</string>
@@ -302,7 +300,7 @@
<string name="permdesc_receiveBluetoothMap" msgid="8656755936919466345">"允许此应用接收和处理蓝牙MAP信息。这意味着，该应用可能会监视发送或到您设备的信息，在您阅读发送到您设备的信息之前擅自删除信息。"</string>
<string name="permlab_getTasks" msgid="6466095396623933906">"检索正在运行的应用"</string>
<string name="permdesc_getTasks" msgid="7454215995847658102">"允许该应用检索近期运行的和当前正在运行的任务的相关信息。此权限可让该应用了解设备上使用了哪些应用。"</string>
- <string name="permlab_startTasksFromRecents" msgid="8990073877885690623">"从“最近用过的应用”发起任务"</string>
+ <string name="permlab_startTasksFromRecents" msgid="8990073877885690623">"从“最近”发起任务"</string>
<string name="permdesc_startTasksFromRecents" msgid="7382133554871222235">"允许应用使用ActivityManager.RecentTaskInfo对象发起从ActivityManager.getRecentTaskList()返回的无效任务。"</string>
<string name="permlab_interactAcrossUsers" msgid="7114255281944211682">"用户间互动"</string>
<string name="permdesc_interactAcrossUsers" msgid="364670963623385786">"允许该应用在设备上跨多个用户执行操作。恶意应用可能会借此破坏用户之间的保护措施。"</string>
@@ -714,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"允许应用访问所有用户的外部存储设备。"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"访问缓存文件系统"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"允许应用读取和写入缓存文件系统。"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"拨打/接听SIP电话"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"允许该应用拨打和接听SIP电话。"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"与通话屏幕互动"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"允许应用控制用户看到通话屏幕的时机和方式。"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"读取网络使用情况历史记录"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"允许应用读取特定网络和应用的网络使用情况历史记录。"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"管理网络政策"</string>
@@ -916,20 +916,13 @@
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM卡缺失或无法读取。请插入SIM卡。"</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"SIM卡无法使用。"</string>
<string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"您的SIM卡已永久停用。\n请与您的无线服务提供商联系，以便重新获取一张SIM卡。"</string>
- <!-- no translation found for lockscreen_transport_prev_description (6300840251218161534) -->
- <skip />
- <!-- no translation found for lockscreen_transport_next_description (573285210424377338) -->
- <skip />
- <!-- no translation found for lockscreen_transport_pause_description (3980308465056173363) -->
- <skip />
- <!-- no translation found for lockscreen_transport_play_description (1901258823643886401) -->
- <skip />
- <!-- no translation found for lockscreen_transport_stop_description (5907083260651210034) -->
- <skip />
- <!-- no translation found for lockscreen_transport_rew_description (6944412838651990410) -->
- <skip />
- <!-- no translation found for lockscreen_transport_ffw_description (42987149870928985) -->
- <skip />
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"上一曲"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"下一曲"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"暂停"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"播放"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"停止"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"回放"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"快进"</string>
<string name="emergency_calls_only" msgid="6733978304386365407">"只能拨打紧急呼救电话"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"网络已锁定"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM卡已用PUK码锁定。"</string>
@@ -1357,8 +1350,8 @@
<string name="extmedia_format_button_format" msgid="4131064560127478695">"格式化"</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"已连接到USB调试"</string>
<string name="adb_active_notification_message" msgid="1016654627626476142">"触摸可停用USB调试。"</string>
- <string name="select_input_method" msgid="8547250819326693584">"更改键盘输入法"</string>
- <string name="configure_input_methods" msgid="4769971288371946846">"选择键盘输入法"</string>
+ <string name="select_input_method" msgid="8547250819326693584">"更改键盘"</string>
+ <string name="configure_input_methods" msgid="4769971288371946846">"选择键盘"</string>
<string name="use_physical_keyboard" msgid="6203112478095117625">"物理键盘"</string>
<string name="hardware" msgid="7517821086888990278">"硬件"</string>
<string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"选择键盘布局"</string>
@@ -1508,10 +1501,8 @@
<string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"减小小时值"</string>
<string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"设置下午时间"</string>
<string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"设置上午时间"</string>
- <!-- no translation found for time_picker_pm_label (9075415075642718536) -->
- <skip />
- <!-- no translation found for time_picker_am_label (7367798547923815593) -->
- <skip />
+ <string name="time_picker_pm_label" msgid="9075415075642718536">"下午"</string>
+ <string name="time_picker_am_label" msgid="7367798547923815593">"上午"</string>
<string name="date_picker_increment_month_button" msgid="5369998479067934110">"增大月份值"</string>
<string name="date_picker_decrement_month_button" msgid="1832698995541726019">"减小月份值"</string>
<string name="date_picker_increment_day_button" msgid="7130465412308173903">"增大日期值"</string>
@@ -1773,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"已选择<xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"已删除<xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"工作<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"您目前处于单应用模式。要退出，请触摸并按住“最近用过的应用”按钮"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"您目前处于单应用模式。"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"要使用“单应用模式”吗？"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"“单应用模式”功能会锁定屏幕，使其只显示一个应用。{\n\n要退出，请触摸并按住“最近用过的应用”按钮。"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"不用了"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"启动"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"已开启单应用模式"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"已退出单应用模式"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"退出前要求输入%1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN码"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"解锁图案"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"密码"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"美国电视分级制度"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"挑逗性对话（通常是指关于性的谈话）"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"含粗俗言语"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"色情内容"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"暴力内容"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"幻想暴力（仅限儿童节目）"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index ffd50ff..1dfcad3 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"允許應用程式存取外部儲存空間 (所有用戶)。"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"存取快取檔案系統"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"允許應用程式讀取及寫入快取檔案系統。"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"撥打/接聽 SIP 電話"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"允許應用程式撥打及接聽 SIP 電話。"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"與通話畫面互動"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"允許應用程式控制通話畫面的顯示時間和方式。"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"讀取網絡用量記錄"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"允許應用程式讀取特定網絡和應用程式的網絡使用量記錄。"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"管理網絡政策"</string>
@@ -1208,7 +1210,7 @@
<string name="chooseUsbActivity" msgid="6894748416073583509">"選取要以 USB 裝置存取的應用程式"</string>
<string name="noApplications" msgid="2991814273936504689">"沒有應用程式可執行這項操作。"</string>
<string name="aerr_title" msgid="1905800560317137752"></string>
- <string name="aerr_application" msgid="932628488013092776">"很抱歉，<xliff:g id="APPLICATION">%1$s</xliff:g> 已停止。"</string>
+ <string name="aerr_application" msgid="932628488013092776">"抱歉，<xliff:g id="APPLICATION">%1$s</xliff:g>已停止操作。"</string>
<string name="aerr_process" msgid="4507058997035697579">"很抱歉，處理程序 <xliff:g id="PROCESS">%1$s</xliff:g> 已停止。"</string>
<string name="anr_title" msgid="4351948481459135709"></string>
<string name="anr_activity_application" msgid="1904477189057199066">"<xliff:g id="APPLICATION">%2$s</xliff:g> 沒有回應。\n\n您要結束嗎？"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"已選取<xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> 已刪除"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"公司<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"您已進入應用程式鎖定模式。如要退出，請輕觸並按住 [最近使用的應用程式] 按鈕"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"您目前正在使用應用程式鎖定模式。"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"要使用「應用程式鎖定」嗎？"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"應用程式鎖定模式會將螢幕鎖定在單一應用程式的畫面。\n\n如要退出，請輕觸並按住 [最近使用的應用程式] 按鈕。"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"不用了，謝謝"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"啟動"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"已進入應用程式鎖定模式"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"已退出應用程式鎖定模式"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"退出時須提供%1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"解鎖圖案"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"密碼"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"美國電視分級制度"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"挑逗性對話 (通常為性暗示)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"言語粗俗"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"色情內容"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"暴力內容"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"虛構暴力 (只針對兒童節目)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index c3f8c09..ec5a424 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -70,8 +70,8 @@
<string name="meid" msgid="4841221237681254195">"MEID"</string>
<string name="ClipMmi" msgid="6952821216480289285">"來電顯示"</string>
<string name="ClirMmi" msgid="7784673673446833091">"本機號碼"</string>
- <string name="ColpMmi" msgid="3065121483740183974">"顯示連線號碼"</string>
- <string name="ColrMmi" msgid="4996540314421889589">"不顯示顯示連線號碼"</string>
+ <string name="ColpMmi" msgid="3065121483740183974">"連接的線路 ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"連接的線路 ID 限制"</string>
<string name="CfMmi" msgid="5123218989141573515">"來電轉接"</string>
<string name="CwMmi" msgid="9129678056795016867">"來電待接"</string>
<string name="BaMmi" msgid="455193067926770581">"通話限制"</string>
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"允許應用程式存取外部儲存空間 (所有使用者)。"</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"存取快取檔案系統"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"允許應用程式讀取及寫入快取檔案系統。"</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"撥打/接聽 SIP 通話"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"允許應用程式撥打及接聽 SIP 通話。"</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"與來電過濾互動"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"允許應用程式控制來電過濾的顯示時機與方式。"</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"讀取網路用量紀錄"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"允許應用程式讀取特定網路和應用程式的網路使用記錄。"</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"管理網路政策"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"已選取 <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="deleted_key" msgid="7659477886625566590">"已刪除 <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"公司<xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"您已進入應用程式鎖定模式。如要退出，請輕觸並按住 [最近使用的應用程式] 按鈕"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"您正在使用應用程式鎖定模式。"</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"要使用「應用程式鎖定」功能嗎？"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"應用程式鎖定模式會將螢幕鎖定在單一應用程式的畫面。\n\n如要退出，請輕觸並按住 [最近使用的應用程式] 按鈕。"</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"不用了，謝謝"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"啟動"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"已進入應用程式鎖定模式"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"已退出應用程式鎖定模式"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"退出時須提供%1$s"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"解鎖圖形"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"密碼"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"美國電視分級制度"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"暗示性對話 (通常為性暗示)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"粗暴語言"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"性愛內容"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"暴力"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"虛構暴力 (僅針對兒童節目)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index 23eee6f..2c461d2 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -712,12 +712,14 @@
<string name="permdesc_sdcardAccessAll" msgid="3215208357415891320">"Vumela uhlelo lokusebenza ukufinyelela isilondolozi sangaphandle kubo bonke abasebenzisi."</string>
<string name="permlab_cache_filesystem" msgid="5656487264819669824">"finyelela kunqolobane yesistimu yefayela"</string>
<string name="permdesc_cache_filesystem" msgid="5578967642265550955">"Ivumela uhlelo lokusebenza ukuthi ifunde futhi ibhale isistimu yokufayila amafayela esikhashana."</string>
- <!-- no translation found for permlab_use_sip (2052499390128979920) -->
- <skip />
- <!-- no translation found for permdesc_use_sip (2297804849860225257) -->
- <skip />
+ <string name="permlab_use_sip" msgid="2052499390128979920">"yenza/thola amakholi we-SIP"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Ivumela uhlelo lokusebenza ukwenza nokuthola amakholi we-SIP."</string>
<string name="permlab_bind_call_service" msgid="6724009726671246551">"hlanganyela neskrini esingaphakathi kwekholi"</string>
<string name="permdesc_bind_call_service" msgid="8732547662442572435">"Ivumela uhlelo lokusebenza ukuthi lulawule ukuthi umsebenzisi ubona kanjani isikrini esingaphakathi kwekholi."</string>
+ <!-- no translation found for permlab_bind_connection_service (3557341439297014940) -->
+ <skip />
+ <!-- no translation found for permdesc_bind_connection_service (4008754499822478114) -->
+ <skip />
<string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"funda ukusetshenziswa komlando wohleloxhumano"</string>
<string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Ivumela uhlelo lokusebenza ukuthi ifunde umlando wokusetshenziswa kwenethiwekhi emanethiwekhini athize kanye nasezinsizeni."</string>
<string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"phatha inqubomgomo yenethiwekhi"</string>
@@ -1762,530 +1764,31 @@
<string name="item_is_selected" msgid="949687401682476608">"I-<xliff:g id="ITEM">%1$s</xliff:g> ekhethiwe"</string>
<string name="deleted_key" msgid="7659477886625566590">"I-<xliff:g id="KEY">%1$s</xliff:g> isusiwe"</string>
<string name="managed_profile_label_badge" msgid="2355652472854327647">"Umsebenzi <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_toast" msgid="2126866321272822564">"Ukhiyeleke kumodi yesikhiya sohlelo lokusebenza. Ukuze uphume, thinta futhi ubambe inkinobho ye-Okwakamuva"</string>
- <string name="lock_to_app_toast_locked" msgid="4229650395479263497">"Ukwimodi yokukhiya kuhlelo lokusebenza."</string>
- <string name="lock_to_app_title" msgid="5895142291937470019">"Sebenzisa isikhiya sohlelo lokusebenza?"</string>
- <string name="lock_to_app_description" msgid="2800403592608529611">"Isikhiya sohlelo lokusebenza lukhiya isibonisi kuhlelo lokusebenza olulodwa.\n\nUkuze uphume, thinta bese ubambe inkinobho ye-Okwakamuva."</string>
+ <!-- no translation found for lock_to_app_toast (1230563865743799321) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_accessible (3340628918851844044) -->
+ <skip />
+ <!-- no translation found for lock_to_app_toast_locked (8739004135132606329) -->
+ <skip />
+ <!-- no translation found for lock_to_app_title (1682643873107812874) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description (9076084599283282800) -->
+ <skip />
+ <!-- no translation found for lock_to_app_description_accessible (2132076937479670601) -->
+ <skip />
<string name="lock_to_app_negative" msgid="2259143719362732728">"CHA, NGIYABONGA"</string>
<string name="lock_to_app_positive" msgid="7085139175671313864">"QALA"</string>
- <string name="lock_to_app_start" msgid="3074665051586318340">"Khiyela kuhlelo lokusebenza"</string>
- <string name="lock_to_app_exit" msgid="8967089657201849300">"Akusakhiyelwe kuhlelo lokusebenza"</string>
- <string name="lock_to_app_use_screen_lock" msgid="1434584309048590886">"Cela i-%1$s ngaphambi kokuphuma"</string>
+ <!-- no translation found for lock_to_app_start (6643342070839862795) -->
+ <skip />
+ <!-- no translation found for lock_to_app_exit (8598219838213787430) -->
+ <skip />
+ <!-- no translation found for lock_to_app_use_screen_lock (5732663305876339596) -->
+ <skip />
<string name="lock_to_app_unlock_pin" msgid="7908385370846820001">"IPHINIKHODI"</string>
<string name="lock_to_app_unlock_pattern" msgid="7763071104790758405">"iphethini yokuvula"</string>
<string name="lock_to_app_unlock_password" msgid="795224196583495868">"iphasiwedi"</string>
- <!-- no translation found for description_amtvrs (8725404332673690032) -->
- <skip />
- <!-- no translation found for description_amtvrs_y (4535932507762824125) -->
- <skip />
- <!-- no translation found for description_amtvrs_y7 (4843157405053727570) -->
- <skip />
- <!-- no translation found for description_amtvrs_ga (8280008424151423133) -->
- <skip />
- <!-- no translation found for description_amtvrs_tw (2578136749233401367) -->
- <skip />
- <!-- no translation found for description_amtvrs_t (345761291919031095) -->
- <skip />
- <!-- no translation found for description_amtvrs_a (6457819648253336739) -->
- <skip />
- <!-- no translation found for description_amtvas (2864199922297854008) -->
- <skip />
- <!-- no translation found for description_amtvas_ec (7983817930744979095) -->
- <skip />
- <!-- no translation found for description_amtvas_e (3756149542498884183) -->
- <skip />
- <!-- no translation found for description_amtvas_e9 (5456413573244777003) -->
- <skip />
- <!-- no translation found for description_amtvas_t (7944661452049158964) -->
- <skip />
- <!-- no translation found for description_amtvas_m (7223239588624385377) -->
- <skip />
- <!-- no translation found for description_amtvas_ao (9151873011261050673) -->
- <skip />
- <!-- no translation found for description_artv_all (364978047754520239) -->
- <skip />
- <!-- no translation found for description_artv_13 (2899455922796919350) -->
- <skip />
- <!-- no translation found for description_artv_16 (7307425436483512910) -->
- <skip />
- <!-- no translation found for description_artv_18 (9209927176612264497) -->
- <skip />
- <!-- no translation found for description_autv_ctc (580007133665370344) -->
- <skip />
- <!-- no translation found for description_autv_g (8766137647646009788) -->
- <skip />
- <!-- no translation found for description_autv_pg (1120374039233559514) -->
- <skip />
- <!-- no translation found for description_autv_m (5699878848170834347) -->
- <skip />
- <!-- no translation found for description_autv_ma15 (1649811423937841031) -->
- <skip />
- <!-- no translation found for description_autv_r18 (4731492357626559718) -->
- <skip />
- <!-- no translation found for description_autv_x18 (7471360113223867348) -->
- <skip />
- <!-- no translation found for description_bgtv_a (4080107560220623980) -->
- <skip />
- <!-- no translation found for description_bgtv_b (3562986880206334536) -->
- <skip />
- <!-- no translation found for description_bgtv_c (2118865606515175311) -->
- <skip />
- <!-- no translation found for description_bgtv_d (2154327256494352024) -->
- <skip />
- <!-- no translation found for description_bgtv_x (8152747703122141371) -->
- <skip />
- <!-- no translation found for description_brtv_l (1556506348989197233) -->
- <skip />
- <!-- no translation found for description_brtv_10 (6482474511057295426) -->
- <skip />
- <!-- no translation found for description_brtv_12 (3866073463174552388) -->
- <skip />
- <!-- no translation found for description_brtv_14 (8000276408382866766) -->
- <skip />
- <!-- no translation found for description_brtv_16 (1763867402144709767) -->
- <skip />
- <!-- no translation found for description_brtv_18 (9024148588030726309) -->
- <skip />
- <!-- no translation found for description_catv_exempt (3972646497134886470) -->
- <skip />
- <!-- no translation found for description_catv_c (4440403088748913964) -->
- <skip />
- <!-- no translation found for description_catv_c8 (7157242552288918297) -->
- <skip />
- <!-- no translation found for description_catv_g (2109878777115073829) -->
- <skip />
- <!-- no translation found for description_catv_pg (7456573695346477726) -->
- <skip />
- <!-- no translation found for description_catv_14 (8094604146081463304) -->
- <skip />
- <!-- no translation found for description_catv_18 (8687145835253664143) -->
- <skip />
- <!-- no translation found for description_chtv_all (5703231298914686594) -->
- <skip />
- <!-- no translation found for description_chtv_red (2679063110716813555) -->
- <skip />
- <!-- no translation found for description_cltv_i (2317348591464039386) -->
- <skip />
- <!-- no translation found for description_cltv_i7 (1245948898081838683) -->
- <skip />
- <!-- no translation found for description_cltv_i10 (8140128283736708519) -->
- <skip />
- <!-- no translation found for description_cltv_i12 (2739127525854644613) -->
- <skip />
- <!-- no translation found for description_cltv_f (3308749622248009751) -->
- <skip />
- <!-- no translation found for description_cltv_r (157103876726801377) -->
- <skip />
- <!-- no translation found for description_cltv_a (9203004232685495868) -->
- <skip />
- <!-- no translation found for description_detv_all (1483249406177422724) -->
- <skip />
- <!-- no translation found for description_detv_12 (746518079154668613) -->
- <skip />
- <!-- no translation found for description_detv_16 (5690413821191509580) -->
- <skip />
- <!-- no translation found for description_detv_18 (44599484534787974) -->
- <skip />
- <!-- no translation found for description_dktv_g (610947014192685528) -->
- <skip />
- <!-- no translation found for description_dktv_y (4095688983501700645) -->
- <skip />
- <!-- no translation found for description_dktv_r (8739285813310386515) -->
- <skip />
- <!-- no translation found for description_dktv_b (1304947265634583906) -->
- <skip />
- <!-- no translation found for description_estv_tp (1822759030871350269) -->
- <skip />
- <!-- no translation found for description_estv_i (3766033620124690961) -->
- <skip />
- <!-- no translation found for description_estv_7 (8721492435509764830) -->
- <skip />
- <!-- no translation found for description_estv_7i (2711729455452401897) -->
- <skip />
- <!-- no translation found for description_estv_12 (8896931636297130592) -->
- <skip />
- <!-- no translation found for description_estv_16 (2274142720185871523) -->
- <skip />
- <!-- no translation found for description_estv_18 (7368459302885513167) -->
- <skip />
- <!-- no translation found for description_fitv_s (3268310758566961295) -->
- <skip />
- <!-- no translation found for description_fitv_k7 (693997427905447973) -->
- <skip />
- <!-- no translation found for description_fitv_k12 (1373617371750927627) -->
- <skip />
- <!-- no translation found for description_fitv_k16 (1531284982003733718) -->
- <skip />
- <!-- no translation found for description_fitv_k18 (5440994306974743812) -->
- <skip />
- <!-- no translation found for description_frtv_all (4729285903163682811) -->
- <skip />
- <!-- no translation found for description_frtv_10 (6760888448355386128) -->
- <skip />
- <!-- no translation found for description_frtv_12 (6018370898859283738) -->
- <skip />
- <!-- no translation found for description_frtv_16 (1319508720505160960) -->
- <skip />
- <!-- no translation found for description_frtv_18 (7855486306004041345) -->
- <skip />
- <!-- no translation found for description_grtv_all (3165430975737819024) -->
- <skip />
- <!-- no translation found for description_grtv_10 (1318157499799932505) -->
- <skip />
- <!-- no translation found for description_grtv_12 (7932432868625690829) -->
- <skip />
- <!-- no translation found for description_grtv_15 (2697965728032342040) -->
- <skip />
- <!-- no translation found for description_grtv_18 (5844024066808386696) -->
- <skip />
- <!-- no translation found for description_hktv_g (2081098882211904799) -->
- <skip />
- <!-- no translation found for description_hktv_pg (4236656058591150501) -->
- <skip />
- <!-- no translation found for description_hktv_m (1910266085395443787) -->
- <skip />
- <!-- no translation found for description_hutv_u (7724340821106780225) -->
- <skip />
- <!-- no translation found for description_hutv_cf (5713307405730628949) -->
- <skip />
- <!-- no translation found for description_hutv_6 (7875008778965005549) -->
- <skip />
- <!-- no translation found for description_hutv_12 (9156725113080219882) -->
- <skip />
- <!-- no translation found for description_hutv_16 (7544556481624667701) -->
- <skip />
- <!-- no translation found for description_hutv_18 (1626521112701123265) -->
- <skip />
- <!-- no translation found for description_idtv_p (6272206399910862405) -->
- <skip />
- <!-- no translation found for description_idtv_a (8800388643843782465) -->
- <skip />
- <!-- no translation found for description_idtv_a_bo (911576922969663462) -->
- <skip />
- <!-- no translation found for description_idtv_su (4369633040930258866) -->
- <skip />
- <!-- no translation found for description_idtv_bo (1431146686564849087) -->
- <skip />
- <!-- no translation found for description_idtv_r (5827962472458912713) -->
- <skip />
- <!-- no translation found for description_idtv_r_bo (7858447328910604156) -->
- <skip />
- <!-- no translation found for description_idtv_d (7541888404887779669) -->
- <skip />
- <!-- no translation found for description_ietv_ga (4642321747715248533) -->
- <skip />
- <!-- no translation found for description_ietv_ch (3330402268385961544) -->
- <skip />
- <!-- no translation found for description_ietv_ya (4069454081494515303) -->
- <skip />
- <!-- no translation found for description_ietv_ps (7824457229783420380) -->
- <skip />
- <!-- no translation found for description_ietv_ma (2007155969306777422) -->
- <skip />
- <!-- no translation found for description_iltv_g (4043213262243305262) -->
- <skip />
- <!-- no translation found for description_iltv_12 (7780022228603138844) -->
- <skip />
- <!-- no translation found for description_iltv_15 (1539578320983136379) -->
- <skip />
- <!-- no translation found for description_iltv_18 (7970124287967053441) -->
- <skip />
- <!-- no translation found for description_iltv_e (7270515027851109174) -->
- <skip />
- <!-- no translation found for description_intv_u (4409067314659441506) -->
- <skip />
- <!-- no translation found for description_intv_u/a (5184979938382735615) -->
- <skip />
- <!-- no translation found for description_intv_a (4069232615702497582) -->
- <skip />
- <!-- no translation found for description_intv_s (8992315906331100367) -->
- <skip />
- <!-- no translation found for description_istv_l (2060831828024455393) -->
- <skip />
- <!-- no translation found for description_istv_7 (1844519280360863121) -->
- <skip />
- <!-- no translation found for description_istv_10 (4203217618341110046) -->
- <skip />
- <!-- no translation found for description_istv_12 (4834042725603037283) -->
- <skip />
- <!-- no translation found for description_istv_14 (4406801385726606683) -->
- <skip />
- <!-- no translation found for description_istv_16 (365432629005229347) -->
- <skip />
- <!-- no translation found for description_istv_18 (8376140537243510405) -->
- <skip />
- <!-- no translation found for description_krtv_all (1483913188733515440) -->
- <skip />
- <!-- no translation found for description_krtv_7 (8682276932541234333) -->
- <skip />
- <!-- no translation found for description_krtv_12 (6963065489873976068) -->
- <skip />
- <!-- no translation found for description_krtv_15 (6916394374284107977) -->
- <skip />
- <!-- no translation found for description_krtv_19 (7954273383199778597) -->
- <skip />
- <!-- no translation found for description_mvtv_y (3943277859471637549) -->
- <skip />
- <!-- no translation found for description_mvtv_g (4657828520346609827) -->
- <skip />
- <!-- no translation found for description_mvtv_pg (3864658391850426197) -->
- <skip />
- <!-- no translation found for description_mvtv_pg-12 (2216350829013720553) -->
- <skip />
- <!-- no translation found for description_mvtv_12 (5276461870956711977) -->
- <skip />
- <!-- no translation found for description_mvtv_15 (7106953260329293776) -->
- <skip />
- <!-- no translation found for description_mvtv_18 (7006573852262189406) -->
- <skip />
- <!-- no translation found for description_mvtv_21 (7476284001838921253) -->
- <skip />
- <!-- no translation found for description_mvtv_x (6499801610415924301) -->
- <skip />
- <!-- no translation found for description_mxtv_a (7174608035829320762) -->
- <skip />
- <!-- no translation found for description_mxtv_b (3670477404589260152) -->
- <skip />
- <!-- no translation found for description_mxtv_b-15 (8819354848127579747) -->
- <skip />
- <!-- no translation found for description_mxtv_c (3553641627415667328) -->
- <skip />
- <!-- no translation found for description_mxtv_d (3878980934298154757) -->
- <skip />
- <!-- no translation found for description_mxtv_rc (4968210486942321347) -->
- <skip />
- <!-- no translation found for description_mytv_u (7992019130820426014) -->
- <skip />
- <!-- no translation found for description_mytv_p13 (2006920076949391912) -->
- <skip />
- <!-- no translation found for description_mytv_18 (1958247530905842382) -->
- <skip />
- <!-- no translation found for description_nltv_v (1483555324354422551) -->
- <skip />
- <!-- no translation found for description_nltv_f (255578123439921739) -->
- <skip />
- <!-- no translation found for description_nltv_s (6193927829534523304) -->
- <skip />
- <!-- no translation found for description_nltv_d (3374553904035308871) -->
- <skip />
- <!-- no translation found for description_nltv_da (1749379319390419150) -->
- <skip />
- <!-- no translation found for description_nltv_l (4940772416975329234) -->
- <skip />
- <!-- no translation found for description_nltv_al (5041932203459682871) -->
- <skip />
- <!-- no translation found for description_nltv_6 (3546423755489923885) -->
- <skip />
- <!-- no translation found for description_nltv_9 (7376993909159390832) -->
- <skip />
- <!-- no translation found for description_nltv_12 (5978017871069609209) -->
- <skip />
- <!-- no translation found for description_nltv_16 (1179906153900651722) -->
- <skip />
- <!-- no translation found for description_nzftv (146041741052337733) -->
- <skip />
- <!-- no translation found for description_nzftv_g (7541885472155817369) -->
- <skip />
- <!-- no translation found for description_nzftv_pgr (6784787939626550110) -->
- <skip />
- <!-- no translation found for description_nzftv_ao (658380192140260039) -->
- <skip />
- <!-- no translation found for description_nzptv (241701402496277362) -->
- <skip />
- <!-- no translation found for description_nzptv_c (6475200916428978507) -->
- <skip />
- <!-- no translation found for description_nzptv_v (5240133670204303166) -->
- <skip />
- <!-- no translation found for description_nzptv_l (7918327057227193483) -->
- <skip />
- <!-- no translation found for description_nzptv_s (273281440427641308) -->
- <skip />
- <!-- no translation found for description_nzptv_g (973626491011050055) -->
- <skip />
- <!-- no translation found for description_nzptv_pg (4758011078051581792) -->
- <skip />
- <!-- no translation found for description_nzptv_m (1567051823394181103) -->
- <skip />
- <!-- no translation found for description_nzptv_16 (5669667948991057907) -->
- <skip />
- <!-- no translation found for description_nzptv_18 (1657260722016869371) -->
- <skip />
- <!-- no translation found for description_petv (5559685180480404628) -->
- <skip />
- <!-- no translation found for description_petv_a (5173645608432271582) -->
- <skip />
- <!-- no translation found for description_petv_14 (5966087674663742056) -->
- <skip />
- <!-- no translation found for description_petv_18 (7019630766403420130) -->
- <skip />
- <!-- no translation found for description_peatv (3634656795668410617) -->
- <skip />
- <!-- no translation found for description_peatv_gp (3618385648727054626) -->
- <skip />
- <!-- no translation found for description_peatv_pg (7593142528684761505) -->
- <skip />
- <!-- no translation found for description_peatv_14 (5859459560298362393) -->
- <skip />
- <!-- no translation found for description_peatv_18 (2553706587014952987) -->
- <skip />
- <!-- no translation found for description_phtv_g (2881516809627264027) -->
- <skip />
- <!-- no translation found for description_phtv_pg (7482341361410927180) -->
- <skip />
- <!-- no translation found for description_phtv_spg (3887913591843612878) -->
- <skip />
- <!-- no translation found for description_pltv_g (3565351590443748263) -->
- <skip />
- <!-- no translation found for description_pltv_7 (366413712101571629) -->
- <skip />
- <!-- no translation found for description_pltv_12 (4035426913452019902) -->
- <skip />
- <!-- no translation found for description_pltv_16 (7597517415447468821) -->
- <skip />
- <!-- no translation found for description_pltv_18 (2897280907055051640) -->
- <skip />
- <!-- no translation found for description_pttv_t (4742028020170896717) -->
- <skip />
- <!-- no translation found for description_pttv_10 (8272045717843749489) -->
- <skip />
- <!-- no translation found for description_pttv_12 (6944802687353314948) -->
- <skip />
- <!-- no translation found for description_pttv_16 (8071670633939250916) -->
- <skip />
- <!-- no translation found for description_rotv_y (969324821485320166) -->
- <skip />
- <!-- no translation found for description_rotv_g (8500146486438254738) -->
- <skip />
- <!-- no translation found for description_rotv_ap (216575414175684221) -->
- <skip />
- <!-- no translation found for description_rotv_12 (323979906483875270) -->
- <skip />
- <!-- no translation found for description_rotv_15 (6469399617455125913) -->
- <skip />
- <!-- no translation found for description_rotv_18 (3592554928967418416) -->
- <skip />
- <!-- no translation found for description_rutv_0 (1189359151352757515) -->
- <skip />
- <!-- no translation found for description_rutv_6 (2353995318569336577) -->
- <skip />
- <!-- no translation found for description_rutv_12 (5771361352056507174) -->
- <skip />
- <!-- no translation found for description_rutv_16 (972213177494629509) -->
- <skip />
- <!-- no translation found for description_rutv_18 (638034451405144583) -->
- <skip />
- <!-- no translation found for description_rstv_g (3170795792938872243) -->
- <skip />
- <!-- no translation found for description_rstv_12 (8439136546593367639) -->
- <skip />
- <!-- no translation found for description_rstv_14 (4100191434896490937) -->
- <skip />
- <!-- no translation found for description_rstv_15 (6603766886727865412) -->
- <skip />
- <!-- no translation found for description_rstv_16 (8270956181386948273) -->
- <skip />
- <!-- no translation found for description_rstv_17 (297444503123795521) -->
- <skip />
- <!-- no translation found for description_rstv_18 (7698675837977377422) -->
- <skip />
- <!-- no translation found for description_sgftv_pg (3870004698989791235) -->
- <skip />
- <!-- no translation found for description_sgftv_pg13 (4704866814396800249) -->
- <skip />
- <!-- no translation found for description_sgptv_nc16 (545097661241350415) -->
- <skip />
- <!-- no translation found for description_sgptv_m18 (7070031962847685837) -->
- <skip />
- <!-- no translation found for description_sitv_vs (6029303058492749615) -->
- <skip />
- <!-- no translation found for description_sitv_12 (1562265508790961396) -->
- <skip />
- <!-- no translation found for description_sitv_15 (814397053035102343) -->
- <skip />
- <!-- no translation found for description_sitv_ad (1165818216176162192) -->
- <skip />
- <!-- no translation found for description_thtv_primary (6512252166876553779) -->
- <skip />
- <!-- no translation found for description_thtv_children (1594272832954693188) -->
- <skip />
- <!-- no translation found for description_thtv_general (5808557138959815577) -->
- <skip />
- <!-- no translation found for description_thtv_pg13 (889956538395653454) -->
- <skip />
- <!-- no translation found for description_thtv_pg18 (4562428332758892578) -->
- <skip />
- <!-- no translation found for description_thtv_adults (8538542343641784979) -->
- <skip />
- <!-- no translation found for description_trtv_g (814709416798352432) -->
- <skip />
- <!-- no translation found for description_trtv_7 (4013069254406734945) -->
- <skip />
- <!-- no translation found for description_trtv_13 (1547262200213469515) -->
- <skip />
- <!-- no translation found for description_trtv_18 (7226520040857228271) -->
- <skip />
- <!-- no translation found for description_twtv_g (8446951247865479252) -->
- <skip />
- <!-- no translation found for description_twtv_p (853443650448817932) -->
- <skip />
- <!-- no translation found for description_twtv_pg (7158733234441280037) -->
- <skip />
- <!-- no translation found for description_twtv_r (7722190018180631998) -->
- <skip />
- <!-- no translation found for description_uatv_green circle (4230191850030083669) -->
- <skip />
- <!-- no translation found for description_uatv_yellow triangle (8849499067175997748) -->
- <skip />
- <!-- no translation found for description_uatv_red square (4082028234845100357) -->
- <skip />
- <string name="description_ustvpg" msgid="3666171166900312727">"Imihlahlandlela yabazali ye-TV"</string>
- <string name="description_ustvpg_d" msgid="6552868431924879897">"Ingxoxo eyela ngasocansini (Kusho ukuthi ikhuluma ngezocansi)"</string>
- <string name="description_ustvpg_l" msgid="2427588153488291892">"Ulimi le-Coarse"</string>
- <string name="description_ustvpg_s" msgid="2556047043212535339">"Okuphathelene nezocansi"</string>
- <string name="description_ustvpg_v" msgid="6647466085048806213">"Udlame"</string>
- <string name="description_ustvpg_fv" msgid="4015953953338931020">"Ukuhlukumeza kwezinganekwane (Izinhlelo zezingane kuphela)"</string>
- <!-- no translation found for description_ustvpg_y (6547820726370164424) -->
- <skip />
- <!-- no translation found for description_ustvpg_y7 (2874291795165074132) -->
- <skip />
- <!-- no translation found for description_ustvpg_g (7919375742191053371) -->
- <skip />
- <!-- no translation found for description_ustvpg_pg (8225983744703834021) -->
- <skip />
- <!-- no translation found for description_ustvpg_14 (7397655878454282341) -->
- <skip />
- <!-- no translation found for description_ustvpg_ma (3697701573351883304) -->
- <skip />
- <!-- no translation found for description_vetv_tu (8003039623029896661) -->
- <skip />
- <!-- no translation found for description_vetv_su (5264501691167249797) -->
- <skip />
- <!-- no translation found for description_vetv_a (544323071374454118) -->
- <skip />
- <!-- no translation found for description_zatv_d (6571984174827591259) -->
- <skip />
- <!-- no translation found for description_zatv_v (4679866575541703635) -->
- <skip />
- <!-- no translation found for description_zatv_n (7765574098989944543) -->
- <skip />
- <!-- no translation found for description_zatv_p (1893150762583767795) -->
- <skip />
- <!-- no translation found for description_zatv_s (8564722716580038312) -->
- <skip />
- <!-- no translation found for description_zatv_l (3031691623802167108) -->
- <skip />
- <!-- no translation found for description_zatv_f (5412201271650571415) -->
- <skip />
- <!-- no translation found for description_zatv_pg (6944138875310807057) -->
- <skip />
- <!-- no translation found for description_zatv_13 (2245766192902590932) -->
- <skip />
- <!-- no translation found for description_zatv_16 (7129501987396433120) -->
- <skip />
- <!-- no translation found for description_zatv_18 (3374729017790665930) -->
- <skip />
- <!-- no translation found for description_zatv_r18 (6316770789529705936) -->
- <skip />
<!-- no translation found for battery_saver_description (725676363406667978) -->
<skip />
+ <!-- no translation found for downtime_condition_summary (8761776337475705749) -->
+ <skip />
</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index f6c0d71..08aaa6a 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -733,6 +733,7 @@
<attr name="fastScrollOverlayPosition">
<enum name="floating" value="0" />
<enum name="atThumb" value="1" />
+ <enum name="aboveThumb" value="2" />
</attr>
<!-- Text color for the fast scroll index overlay. Make sure it
plays nicely with fastScrollPreviewBackground[Left|Right]. -->
@@ -2512,6 +2513,19 @@
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16" />
</attr>
+
+ <!-- ViewOutlineProvider used to determine the View's Outline. -->
+ <attr name="outlineProvider">
+ <!-- Default, background drawable-driven outline. -->
+ <enum name="background" value="0" />
+ <!-- No outline provider. -->
+ <enum name="none" value="1" />
+ <!-- Generates an opaque outline for the bounds of the view. -->
+ <enum name="bounds" value="2" />
+ <!-- Generates an opaque outline for the padded bounds of the view. -->
+ <enum name="paddedBounds" value="3" />
+ </attr>
+
</declare-styleable>
<!-- Attributes that can be assigned to a tag for a particular View. -->
@@ -3163,6 +3177,17 @@
result to valid color values. Saturate(S + D) -->
<enum name="add" value="16" />
</attr>
+ <!-- Gravity for aligning a CheckedTextView's checkmark to one side or the other. -->
+ <attr name="checkMarkGravity">
+ <!-- Push object to the left of its container, not changing its size. -->
+ <flag name="left" value="0x03" />
+ <!-- Push object to the right of its container, not changing its size. -->
+ <flag name="right" value="0x05" />
+ <!-- Push object to the beginning of its container, not changing its size. -->
+ <flag name="start" value="0x00800003" />
+ <!-- Push object to the end of its container, not changing its size. -->
+ <flag name="end" value="0x00800005" />
+ </attr>
</declare-styleable>
<declare-styleable name="EditText">
</declare-styleable>
@@ -3185,6 +3210,8 @@
<enum name="floating" value="0" />
<!-- Pinned alongside the thumb. -->
<enum name="atThumb" value="1" />
+ <!-- Pinned above the thumb. -->
+ <enum name="aboveThumb" value="2" />
</attr>
<attr name="textAppearance" />
<attr name="textColor" />
@@ -5209,14 +5236,10 @@
<attr name="name" />
<!-- The width a path stroke -->
<attr name="strokeWidth" format="float" />
- <!-- The opacity of a path stroke @hide-->
- <attr name="strokeOpacity" format="float" />
<!-- The color to stroke the path if not defined implies no stroke-->
<attr name="strokeColor" format="color" />
<!-- The color to fill the path if not defined implies no fill-->
<attr name="fillColor" format="color" />
- <!-- The level of opacity of the filled area of the path @hide-->
- <attr name="fillOpacity" format="float" />
<!-- The specification of the operations that define the path -->
<attr name="pathData" format="string" />
<!-- The fraction of the path to trim from the start from 0 to 1 -->
@@ -6855,9 +6878,11 @@
its {@link android.service.voice.VoiceInteractionService#SERVICE_META_DATA} meta-data entry.
Described here are the attributes that can be included in that tag. -->
<declare-styleable name="VoiceInteractionService">
- <!-- The service that hosts active voice interaction sessions. -->
+ <!-- The service that hosts active voice interaction sessions. This is required. -->
<attr name="sessionService" format="string" />
- <!-- The service that provides voice recognition. -->
+ <!-- The service that provides voice recognition. This is required. When the user
+ selects this voice interaction service, they will also be implicitly selecting
+ the component here for their recognition service. -->
<attr name="recognitionService" format="string" />
<attr name="settingsActivity" />
</declare-styleable>
@@ -7278,9 +7303,8 @@
<!-- Component name of an activity that allows the user to modify
the settings for this service. -->
<attr name="settingsActivity" />
- <!-- Component name of an xml file that describes the structure of TV content ratings that
- this service uses. -->
- <attr name="contentRatingSystemXml" format="reference" />
+ <!-- Reference to an XML document that describes TV content rating. -->
+ <attr name="tvContentRatingDescription" format="reference" />
</declare-styleable>
<declare-styleable name="ResolverDrawerLayout">
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index c268d97..e905a3a 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -277,17 +277,6 @@
applications can request this feature. Default value is false. -->
<attr name="requiredForAllUsers" format="boolean" />
- <!-- Flag to specifiy for which types of profile this application needs to be present.
- Only pre-installed applications can request this feature. Default is none. -->
- <attr name="requiredForProfile">
- <!-- This application needs to be present for restricted profiles -->
- <flag name="restricted" value="0x0001" />
- <!-- This application needs to be present for managed profiles -->
- <flag name="managed" value="0x0002" />
- <!-- This application needs to be present for all types of profiles -->
- <flag name="all" value="0xFFFF" />
- </attr>
-
<!-- Flag indicating whether the application can be debugged, even when
running on a device that is running in user mode. -->
<attr name="debuggable" format="boolean" />
@@ -1073,7 +1062,6 @@
<attr name="hasCode" format="boolean" />
<attr name="persistent" />
<attr name="requiredForAllUsers" />
- <attr name="requiredForProfile" />
<!-- Specify whether the components in this application are enabled or not (that is, can be
instantiated by the system).
If "false", it overrides any component specific values (a value of "true" will not
@@ -1250,7 +1238,9 @@
application.
<p>This appears as a child tag of the root
- {@link #AndroidManifest manifest} tag. -->
+ {@link #AndroidManifest manifest} tag.
+
+ @deprecated Use <code>feature-group</code> instead.-->
<declare-styleable name="AndroidManifestUsesConfiguration" parent="AndroidManifest">
<!-- The type of touch screen used by an application. -->
<attr name="reqTouchScreen" />
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index dd316ed..d538352 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -128,7 +128,7 @@
<drawable name="notification_template_icon_bg">#3333B5E5</drawable>
<drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
- <color name="notification_icon_bg_color">#ffa3a3a3</color>
+ <color name="notification_icon_bg_color">#ff9e9e9e</color>
<color name="notification_action_legacy_color_filter">#ff555555</color>
<color name="notification_media_action_bg">#00000000</color>
@@ -142,5 +142,8 @@
<color name="accessibility_focus_highlight">#bf39b500</color>
+ <color name="system_notification_accent_color">#ff607D8B</color>
+ <color name="battery_saver_mode_color">#fff4511e</color><!-- deep orange 600 -->
+
</resources>
diff --git a/core/res/res/values/colors_leanback.xml b/core/res/res/values/colors_leanback.xml
index dc0c673..e52a861e 100644
--- a/core/res/res/values/colors_leanback.xml
+++ b/core/res/res/values/colors_leanback.xml
@@ -25,4 +25,5 @@
<color name="primary_text_leanback_light">#cc222222</color>
<color name="secondary_text_leanback_light">#99222222</color>
+ <color name="primary_text_leanback_formwizard_default_dark">#ffeeeeee</color>
</resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bf97ca5..a59a489 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1641,6 +1641,11 @@
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
<bool name="imsServiceAllowTurnOff">true</bool>
+ <!-- Flag specifying whether VoLTE & VT should be allowed on device: independent of the
+ carrier provisioning. If false: hard disabled. If true: then depends on carrier
+ provisioning, availability etc -->
+ <bool name="config_mobile_allow_volte_vt">true</bool>
+
<bool name="config_networkSamplingWakesDevice">true</bool>
<string-array translatable="false" name="config_cdma_home_system" />
@@ -1656,4 +1661,11 @@
<!-- Package name providing WebView implementation. -->
<string name="config_webViewPackageName" translatable="false">com.android.webview</string>
+ <!-- If EMS is not supported, framework breaks down EMS into single segment SMS
+ and adds page info " x/y". This config is used to set which carrier doesn't
+ support EMS and whether page info should be added at the beginning or the end.
+ We use tag 'prefix' for position beginning and 'suffix' for position end.
+ Examples: <item>311480;prefix</item> <item>310260;suffix</item>
+ -->
+ <string-array translatable="false" name="no_ems_support_sim_operators" />
</resources>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index bacdc3f..e58bc6f 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -42,11 +42,6 @@
<dimen name="status_bar_icon_size">24dip</dimen>
<!-- Size of the giant number (unread count) in the notifications -->
<dimen name="status_bar_content_number_size">48sp</dimen>
- <!-- Height of the system bar (combined status & navigation); used by
- SystemUI internally, not respected by the window manager. -->
- <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen>
- <!-- Height of notification icons in the system bar -->
- <dimen name="system_bar_icon_size">32dip</dimen>
<!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
<dimen name="status_bar_edge_ignore">5dp</dimen>
@@ -220,11 +215,17 @@
<dimen name="action_bar_stacked_tab_max_width">180dp</dimen>
<!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
- <dimen name="notification_text_size">13dp</dimen>
+ <dimen name="notification_text_size">13sp</dimen>
<!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
- <dimen name="notification_title_text_size">16dp</dimen>
+ <dimen name="notification_title_text_size">16sp</dimen>
<!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
- <dimen name="notification_subtext_size">12dp</dimen>
+ <dimen name="notification_subtext_size">12sp</dimen>
+
+ <!-- 8dp at the top/bottom of the notification view -->
+ <dimen name="notification_vert_pad">10dp</dimen>
+
+ <!-- Replacement for @dimen/notification_vert_pad when the text is large -->
+ <dimen name="notification_large_font_vert_pad">3dp</dimen>
<!-- Keyguard dimensions -->
<!-- TEMP -->
@@ -354,7 +355,6 @@
<dimen name="timepicker_time_label_size">60sp</dimen>
<dimen name="timepicker_extra_time_label_margin">-30dp</dimen>
<dimen name="timepicker_ampm_label_size">16sp</dimen>
- <dimen name="timepicker_done_label_size">14sp</dimen>
<dimen name="timepicker_ampm_left_padding">6dip</dimen>
<dimen name="timepicker_separator_padding">4dip</dimen>
<dimen name="timepicker_header_height">96dip</dimen>
@@ -362,18 +362,18 @@
<dimen name="timepicker_minimum_margin_top_bottom">24dip</dimen>
<dimen name="timepicker_radial_picker_dimen">270dip</dimen>
- <dimen name="datepicker_done_label_size">14sp</dimen>
- <dimen name="datepicker_day_number_size">16sp</dimen>
+ <!-- Used by SimpleMonthView -->
+ <dimen name="datepicker_day_number_size">12sp</dimen>
<dimen name="datepicker_month_label_size">16sp</dimen>
- <dimen name="datepicker_month_day_label_text_size">10sp</dimen>
+ <dimen name="datepicker_month_day_label_text_size">12sp</dimen>
+ <dimen name="datepicker_month_list_item_header_height">48dp</dimen>
<dimen name="datepicker_day_number_select_circle_radius">16dp</dimen>
- <dimen name="datepicker_month_list_item_header_height">50dp</dimen>
- <dimen name="datepicker_view_animator_height">270dp</dimen>
+ <dimen name="datepicker_view_animator_height">250dp</dimen>
+
<dimen name="datepicker_year_picker_padding_top">8dp</dimen>
<dimen name="datepicker_year_label_height">64dp</dimen>
<dimen name="datepicker_year_label_text_size">22dp</dimen>
<dimen name="datepicker_component_width">270dp</dimen>
- <dimen name="datepicker_selected_calendar_layout_height">155dp</dimen>
<dimen name="datepicker_selected_date_day_size">75dp</dimen>
<dimen name="datepicker_selected_date_month_size">30dp</dimen>
<dimen name="datepicker_selected_date_year_size">30dp</dimen>
@@ -393,4 +393,7 @@
<dimen name="lock_pattern_dot_line_width">3dp</dimen>
<dimen name="lock_pattern_dot_size">12dp</dimen>
<dimen name="lock_pattern_dot_size_activated">28dp</dimen>
+
+ <dimen name="text_handle_min_size">40dp</dimen>
+
</resources>
diff --git a/core/res/res/values/dimens_leanback.xml b/core/res/res/values/dimens_leanback.xml
new file mode 100644
index 0000000..c824a2a
--- /dev/null
+++ b/core/res/res/values/dimens_leanback.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Default alpha value for disabled elements. -->
+ <item name="disabled_alpha_leanback_formwizard" format="float" type="dimen">0.2</item>
+ <!-- The duration of most animations related to screen content transitions -->
+ <integer name="leanback_setup_base_animation_duration">500</integer>
+ <item name="leanback_setup_alpha_animiation_max_opacity" format="float" type="dimen">1.0</item>
+ <item name="leanback_setup_alpha_animiation_min_opacity" format="float" type="dimen">0.0</item>
+ <!-- Where stable, on-screen content rests -->
+ <dimen name="leanback_setup_translation_content_resting_point">0dp</dimen>
+ <integer name="leanback_setup_translation_content_resting_point_v4">0</integer>
+ <!-- The screen position at which content enters/exits. If you're over the edge of the cliff, we can't see you. -->
+ <dimen name="leanback_setup_translation_content_cliff">100dp</dimen>
+ <integer name="leanback_setup_translation_content_cliff_v4">200</integer>
+
+ <!-- Opacity animation for activity background -->
+ <!-- The opacity of the background of the new activity background when the alpha animation starts-->
+ <item name="leanback_setup_alpha_activity_in_bkg_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <!-- The opacity of the background of the new activity background when the alpha animation ends-->
+ <item name="leanback_setup_alpha_activity_in_bkg_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <integer name="leanback_setup_alpha_activity_in_bkg_delay">0</integer>
+ <integer name="leanback_setup_alpha_activity_in_bkg_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <item name="leanback_setup_alpha_activity_out_bkg_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <!-- The opacity of the background of the new activity background when the alpha animation ends-->
+ <item name="leanback_setup_alpha_activity_out_bkg_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <integer name="leanback_setup_alpha_activity_out_bkg_delay">0</integer>
+ <integer name="leanback_setup_alpha_activity_out_bkg_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <!-- Content forward animation configuration values -->
+ <!-- Parameter for alpha animation of new content coming on to the screen when we're moving "forward" -->
+ <!-- Initial opacity of the new content that is coming on to the screen -->
+ <item name="leanback_setup_alpha_forward_in_content_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <item name="leanback_setup_alpha_forward_in_content_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <integer name="leanback_setup_alpha_forward_in_content_delay">0</integer>
+ <integer name="leanback_setup_alpha_forward_in_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <item name="leanback_setup_alpha_forward_out_content_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <item name="leanback_setup_alpha_forward_out_content_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <integer name="leanback_setup_alpha_forward_out_content_delay">0</integer>
+ <integer name="leanback_setup_alpha_forward_out_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <!-- Position animation of incoming content during a "forward" transition -->
+ <dimen name="leanback_setup_translation_forward_in_content_start">@dimen/leanback_setup_translation_content_cliff</dimen>
+ <dimen name="leanback_setup_translation_forward_in_content_start_v4">@integer/leanback_setup_translation_content_cliff_v4</dimen>
+ <dimen name="leanback_setup_translation_forward_in_content_end">@dimen/leanback_setup_translation_content_resting_point</dimen>
+ <dimen name="leanback_setup_translation_forward_in_content_end_v4">@integer/leanback_setup_translation_content_resting_point_v4</dimen>
+ <integer name="leanback_setup_translation_forward_in_content_delay">0</integer>
+ <integer name="leanback_setup_translation_forward_in_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <!-- Content backward animation configuration values -->
+ <!-- Alpha animation values for the content that will be displayed after the transition is complete, this is the content coming in. -->
+ <item name="leanback_setup_alpha_backward_in_content_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <item name="leanback_setup_alpha_backward_in_content_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <integer name="leanback_setup_alpha_backward_in_content_delay">0</integer>
+ <integer name="leanback_setup_alpha_backward_in_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <!-- Alpha animiation values for the content that is displayed when the transition starts, this is the content going away. -->
+ <item name="leanback_setup_alpha_backward_out_content_start" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_max_opacity</item>
+ <item name="leanback_setup_alpha_backward_out_content_end" format="float" type="dimen">@dimen/leanback_setup_alpha_animiation_min_opacity</item>
+ <integer name="leanback_setup_alpha_backward_out_content_delay">0</integer>
+ <integer name="leanback_setup_alpha_backward_out_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+
+ <!-- Position animation for content that is displayed when the transition starts, this is the content going away. -->
+ <dimen name="leanback_setup_translation_backward_out_content_start">@dimen/leanback_setup_translation_content_resting_point</dimen>
+ <dimen name="leanback_setup_translation_backward_out_content_start_v4">@integer/leanback_setup_translation_content_resting_point_v4</dimen>
+ <dimen name="leanback_setup_translation_backward_out_content_end">@dimen/leanback_setup_translation_content_cliff</dimen>
+ <dimen name="leanback_setup_translation_backward_out_content_end_v4">@integer/leanback_setup_translation_content_cliff_v4</dimen>
+ <integer name="leanback_setup_translation_backward_out_content_delay">0</integer>
+ <integer name="leanback_setup_translation_backward_out_content_duration">@integer/leanback_setup_base_animation_duration</integer>
+</resources>
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index c21dc59..972ae5e 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -42,10 +42,12 @@
<dimen name="text_size_headline_material">24sp</dimen>
<dimen name="text_size_title_material">20sp</dimen>
<dimen name="text_size_subhead_material">16sp</dimen>
+ <dimen name="text_size_title_material_toolbar">20dp</dimen>
+ <dimen name="text_size_subtitle_material_toolbar">16dp</dimen>
+ <dimen name="text_size_menu_material">16sp</dimen>
<dimen name="text_size_body_2_material">14sp</dimen>
<dimen name="text_size_body_1_material">14sp</dimen>
<dimen name="text_size_caption_material">12sp</dimen>
- <dimen name="text_size_menu_material">14sp</dimen>
<dimen name="text_size_button_material">14sp</dimen>
<dimen name="text_size_large_material">22sp</dimen>
@@ -71,4 +73,6 @@
<!-- Default alpha value for disabled elements. -->
<item name="disabled_alpha_material" format="float" type="dimen">0.26</item>
+
+ <dimen name="alert_dialog_padding_material">12dp</dimen>
</resources>
diff --git a/core/res/res/values/donottranslate_material.xml b/core/res/res/values/donottranslate_material.xml
index 9ed9553..9cf9f6cf 100644
--- a/core/res/res/values/donottranslate_material.xml
+++ b/core/res/res/values/donottranslate_material.xml
@@ -23,10 +23,10 @@
<string name="font_family_headline_material">sans-serif</string>
<string name="font_family_title_material">sans-serif-medium</string>
<string name="font_family_subhead_material">sans-serif</string>
+ <string name="font_family_menu_material">sans-serif</string>
<string name="font_family_body_2_material">sans-serif-medium</string>
<string name="font_family_body_1_material">sans-serif</string>
<string name="font_family_caption_material">sans-serif</string>
- <string name="font_family_menu_material">sans-serif-medium</string>
<string name="font_family_button_material">sans-serif-medium</string>
</resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 67352d7..ed66c65 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2118,11 +2118,9 @@
<public type="attr" name="transitionGroup" />
<public type="attr" name="viewportWidth" />
<public type="attr" name="viewportHeight" />
- <public type="attr" name="fillOpacity" />
<public type="attr" name="fillColor" />
<public type="attr" name="pathData" />
<public type="attr" name="strokeColor" />
- <public type="attr" name="strokeOpacity" />
<public type="attr" name="strokeWidth" />
<public type="attr" name="trimPathStart" />
<public type="attr" name="trimPathEnd" />
@@ -2130,8 +2128,7 @@
<public type="attr" name="strokeLineCap" />
<public type="attr" name="strokeLineJoin" />
<public type="attr" name="strokeMiterLimit" />
- <public type="attr" name="requiredForProfile"/>
- <public type="attr" name="colorControlNormal" />
+ <public type="attr" name="colorControlNormal" id="0x1010429"/>
<public type="attr" name="colorControlActivated" />
<public type="attr" name="colorButtonNormal" />
<public type="attr" name="colorControlHighlight" />
@@ -2269,12 +2266,13 @@
<public type="attr" name="windowReenterTransition" />
<public type="attr" name="windowSharedElementReturnTransition" />
<public type="attr" name="windowSharedElementReenterTransition" />
- <public type="attr" name="contentRatingSystemXml"/>
+ <public type="attr" name="tvContentRatingDescription"/>
<public type="attr" name="datePickerMode"/>
<public type="attr" name="timePickerMode"/>
<public type="attr" name="inset" />
<public type="attr" name="letterSpacing" />
<public type="attr" name="fontFeatureSettings" />
+ <public type="attr" name="outlineProvider" />
<public-padding type="dimen" name="l_resource_pad" end="0x01050010" />
@@ -2520,6 +2518,22 @@
<public type="style" name="Widget.Material.Button.Borderless.Colored" />
<public type="style" name="Widget.Material.Light.Button.Borderless.Colored" />
+ <public type="style" name="Theme.Leanback.FormWizard"/>
+
+ <public type="style" name="TextAppearance.StatusBar.Material" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Title" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Line2" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Info" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
+ <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
+
+ <public type="style" name="Widget.Material.Spinner.Form" />
+ <public type="style" name="Widget.Material.Light.Spinner.Form" />
+
+ <public type="style" name="TextAppearance.Material.Widget.Toolbar.Title" />
+ <public type="style" name="TextAppearance.Material.Widget.Toolbar.Subtitle" />
+
<public-padding type="string" name="l_resource_pad" end="0x01040030" />
<public type="string" name="config_webSettingsDefaultTextEncoding" />
@@ -2530,8 +2544,6 @@
<public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />
- <public type="style" name="Theme.Leanback.FormWizard"/>
-
<!-- An interpolator which accelerates fast but decelerates slowly. -->
<public type="interpolator" name="fast_out_slow_in" />
<!-- An interpolator which starts with a peak non-zero velocity and decelerates slowly. -->
@@ -2566,23 +2578,4 @@
<public type="raw" name="loaderror" id="0x01100000"/>
<!-- WebView error page for when domain lookup fails. @hide @SystemApi -->
<public type="raw" name="nodomain"/>
-
- <!-- Base text appearance for SystemUI elements -->
- <public type="style" name="TextAppearance.StatusBar.Material" />
- <!-- Base text appearance for notifications -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent" />
- <!-- Notification text appearance: title -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Title" />
- <!-- Notification text appearance: additional line of text sandwiched
- between the title and content -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Line2" />
- <!-- Notification text appearance: an annotation, e.g. the
- number of messages in your inbox -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Info" />
- <!-- Notification text appearance: timestamp -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
- <!-- Notification text appearance: a way to highlight a bit of text (for
- example, to separate the sender from the subject of an email if they
- are all on the same line) -->
- <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index e67eae1..78ba738 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1160,12 +1160,6 @@
interface of a widget service. Should never be needed for normal apps.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permlab_bindRouteProvider">bind to a route provider service</string>
- <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permdesc_bindRouteProvider">Allows the holder to bind to any registered
- route providers. Should never be needed for normal apps.</string>
-
- <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bindDeviceAdmin">interact with a device admin</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bindDeviceAdmin">Allows the holder to send intents to
@@ -2112,9 +2106,19 @@
<string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permlab_bind_call_service">interact with in-call screen</string>
+ <string name="permlab_bind_incall_service">interact with in-call screen</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permdesc_bind_call_service">Allows the app to control when and how the user sees the in-call screen.</string>
+ <string name="permdesc_bind_incall_service">Allows the app to control when and how the user sees the in-call screen.</string>
+
+ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_bind_connection_service">interact with telephony services</string>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_bind_connection_service">Allows the app to interact with telephony services to make/receive calls.</string>
+
+ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_control_incall_experience">provide an in-call user experience</string>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_control_incall_experience">Allows the app to provide an in-call user experience.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_readNetworkUsageHistory">read historical network usage</string>
@@ -2147,11 +2151,6 @@
<string name="permdesc_bindConditionProviderService">Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permlab_bindMediaRouteService">bind to a media route service</string>
- <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permdesc_bindMediaRouteService">Allows the holder to bind to the top-level interface of a media route service. Should never be needed for normal apps.</string>
-
- <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bindDreamService">bind to a dream service</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bindDreamService">Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps.</string>
@@ -3778,8 +3777,9 @@
<string name="select_input_method">Change keyboard</string>
<!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
<string name="configure_input_methods">Choose keyboards</string>
- <!-- Summary text of a toggle switch to enable/disable use of the physical keyboard in the input method selector [CHAR LIMIT=25] -->
- <string name="use_physical_keyboard">Physical keyboard</string>
+ <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+ keyboard is connected[CHAR LIMIT=25] -->
+ <string name="show_ime">Show input method</string>
<!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
<string name="hardware">Hardware</string>
@@ -3893,10 +3893,10 @@
<!-- Description of an application permission that lets it control keyguard. -->
<string name="permdesc_recovery">Allows an application to interact with the recovery system and system updates.</string>
- <!-- Title of an application permission that lets it create media projection sessions. -->
- <string name="permlab_createMediaProjection">Create media projection sessions</string>
- <!-- Description of an application permission that lets it create media projection sessions. -->
- <string name="permdesc_createMediaProjection">Allows an application to create media projection sessions. These sessions can provide applications the ability to capture display and audio contents. Should never be needed by normal apps.</string>
+ <!-- Title of an application permission that lets it manage media projection sessions. -->
+ <string name="permlab_manageMediaProjection">Manage media projection sessions</string>
+ <!-- Description of an application permission that lets it manage media projection sessions. -->
+ <string name="permdesc_manageMediaProjection">Allows an application to manage media projection sessions. These sessions can provide applications the ability to capture display and audio contents. Should never be needed by normal apps.</string>
<!-- Title of an application permission that lets it read install sessions. -->
<string name="permlab_readInstallSessions">Read install sessions</string>
@@ -4239,15 +4239,15 @@
<string name="data_usage_warning_body">Touch to view usage and settings.</string>
<!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_3g_limit_title">2G-3G data is off</string>
+ <string name="data_usage_3g_limit_title">2G-3G data limit reached</string>
<!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_4g_limit_title">4G data is off</string>
+ <string name="data_usage_4g_limit_title">4G data limit reached</string>
<!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_mobile_limit_title">Cellular data is off</string>
+ <string name="data_usage_mobile_limit_title">Cellular data limit reached</string>
<!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_wifi_limit_title">Wi-Fi data is off</string>
+ <string name="data_usage_wifi_limit_title">Wi-Fi data limit reached</string>
<!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_limit_body">Limit reached</string>
+ <string name="data_usage_limit_body">Data paused for rest of cycle</string>
<!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
<string name="data_usage_3g_limit_snoozed_title">2G-3G data limit exceeded</string>
@@ -4839,24 +4839,28 @@
<string name="day_of_week_label_typeface">sans-serif</string>
<!-- Notify use that they are in Lock-to-app -->
- <string name="lock_to_app_toast">You are in lock-to-app mode. To exit, touch and hold the Recents button</string>
+ <string name="lock_to_app_toast">To unpin this screen, touch and hold Back and Recents at the same time.</string>
+ <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+ <string name="lock_to_app_toast_accessible">To unpin this screen, touch and hold Recents.</string>
<!-- Notify user that they are locked in lock-to-app mode -->
- <string name="lock_to_app_toast_locked">You are in Lock-to-App mode.</string>
+ <string name="lock_to_app_toast_locked">Screen is pinned. Unpinning isn\'t allowed by your organization.</string>
<!-- Lock-to-app dialog title. -->
- <string name="lock_to_app_title">Use lock-to-app?</string>
+ <string name="lock_to_app_title">Use screen pinning?</string>
<!-- Lock-to-app dialog description. -->
- <string name="lock_to_app_description">Lock-to-app locks the display in a single app.\n\nTo exit, touch and hold the Recents button.</string>
+ <string name="lock_to_app_description">Screen pinning locks the display in a single view.\n\nTo exit, touch and hold Back and Recents at the same time.</string>
+ <!-- Lock-to-app dialog description when in accessibility mode. -->
+ <string name="lock_to_app_description_accessible">Screen pinning locks the display in a single view.\n\nTo exit, touch and hold Recents.</string>
<!-- Lock-to-app negative response. -->
<string name="lock_to_app_negative">NO, THANKS</string>
<!-- Lock-to-app positive response. -->
<string name="lock_to_app_positive">START</string>
<!-- Starting lock-to-app indication. -->
- <string name="lock_to_app_start">Locked to app</string>
+ <string name="lock_to_app_start">Screen pinned</string>
<!-- Exting lock-to-app indication. -->
- <string name="lock_to_app_exit">No longer locked to app</string>
+ <string name="lock_to_app_exit">Screen unpinned</string>
<!-- Lock-to-app checkbox for lock on exit -->
- <string name="lock_to_app_use_screen_lock">Ask for %1$s before exiting</string>
+ <string name="lock_to_app_use_screen_lock">Ask for %1$s before unpinning</string>
<!-- Lock-to-app unlock pin string -->
<string name="lock_to_app_unlock_pin">PIN</string>
@@ -4867,35 +4871,35 @@
<!-- Range specific TV content rating system strings for AM TV -->
<string name="display_name_amtvrs" translatable="false">AM-TV-RS</string>
- <string name="description_amtvrs">Range specific TV content rating system strings for Armenia</string>
+ <string name="description_amtvrs" translatable="false">Range specific TV content rating system strings for Armenia</string>
<string name="display_name_amtvrs_y" translatable="false">Y</string>
<string name="display_name_amtvrs_y7" translatable="false">Y7</string>
<string name="display_name_amtvrs_ga" translatable="false">GA</string>
<string name="display_name_amtvrs_tw" translatable="false">TW</string>
<string name="display_name_amtvrs_t" translatable="false">T</string>
<string name="display_name_amtvrs_a" translatable="false">A</string>
- <string name="description_amtvrs_y">Suitable for ages 2–11</string>
- <string name="description_amtvrs_y7">Suitable for ages 7–16</string>
- <string name="description_amtvrs_ga">Suitable for general audiences</string>
- <string name="description_amtvrs_tw">Suitable for teens ages 9 and up</string>
- <string name="description_amtvrs_t">Suitable for teens ages 12 and up</string>
- <string name="description_amtvrs_a">Suitable only for adults ages 18 and up</string>
+ <string name="description_amtvrs_y" translatable="false">Suitable for ages 2-11</string>
+ <string name="description_amtvrs_y7" translatable="false">Suitable for ages 7-16</string>
+ <string name="description_amtvrs_ga" translatable="false">Suitable for general audiences</string>
+ <string name="description_amtvrs_tw" translatable="false">Suitable for teens ages 9 and up</string>
+ <string name="description_amtvrs_t" translatable="false">Suitable for teens ages 12 and up</string>
+ <string name="description_amtvrs_a" translatable="false">Suitable only for adults ages 18 and up</string>
<!-- Age specific TV content rating system strings for AM TV -->
<string name="display_name_amtvas" translatable="false">AM-TV-AS</string>
- <string name="description_amtvas">Age specific TV content rating system strings for Armenia</string>
+ <string name="description_amtvas" translatable="false">Age specific TV content rating system strings for Armenia</string>
<string name="display_name_amtvas_ec" translatable="false">EC</string>
<string name="display_name_amtvas_e" translatable="false">E</string>
<string name="display_name_amtvas_e9" translatable="false">E9</string>
<string name="display_name_amtvas_t" translatable="false">T</string>
<string name="display_name_amtvas_m" translatable="false">M</string>
<string name="display_name_amtvas_ao" translatable="false">AO</string>
- <string name="description_amtvas_ec">Suitable for ages 2 and up</string>
- <string name="description_amtvas_e">Suitable for ages 5 and up</string>
- <string name="description_amtvas_e9">Suitable for ages 9 and up</string>
- <string name="description_amtvas_t">Suitable for ages 12 and up</string>
- <string name="description_amtvas_m">Suitable for ages 16 and up</string>
- <string name="description_amtvas_ao">Suitable for ages 17 and up</string>
+ <string name="description_amtvas_ec" translatable="false">Suitable for ages 2 and up</string>
+ <string name="description_amtvas_e" translatable="false">Suitable for ages 5 and up</string>
+ <string name="description_amtvas_e9" translatable="false">Suitable for ages 9 and up</string>
+ <string name="description_amtvas_t" translatable="false">Suitable for ages 12 and up</string>
+ <string name="description_amtvas_m" translatable="false">Suitable for ages 16 and up</string>
+ <string name="description_amtvas_ao" translatable="false">Suitable for ages 17 and up</string>
<!-- TV content rating system strings for AR TV -->
<string name="display_name_artv" translatable="false">AR-TV</string>
@@ -4903,10 +4907,10 @@
<string name="display_name_artv_13" translatable="false">Apto para mayores de 13 años</string>
<string name="display_name_artv_16" translatable="false">Apto para mayores de 16 años</string>
<string name="display_name_artv_18" translatable="false">Apto para mayores de 18 años</string>
- <string name="description_artv_all">Suitable for all audiences. Programs may contain mild violence, language and mature situations</string>
- <string name="description_artv_13">Suitable for ages 13 and up. Programs may contain mild to moderate language and mild violence and sexual references</string>
- <string name="description_artv_16">Suitable for ages 16 and up. Programs may contain more intensive violence and coarse language, partial nudity and moderate sexual references</string>
- <string name="description_artv_18">Suitable for mature audiences only. Programs contain strong violence, coarse language and explicit sexual references</string>
+ <string name="description_artv_all" translatable="false">Suitable for all audiences. Programs may contain mild violence, language and mature situations</string>
+ <string name="description_artv_13" translatable="false">Suitable for ages 13 and up. Programs may contain mild to moderate language and mild violence and sexual references</string>
+ <string name="description_artv_16" translatable="false">Suitable for ages 16 and up. Programs may contain more intensive violence and coarse language, partial nudity and moderate sexual references</string>
+ <string name="description_artv_18" translatable="false">Suitable for mature audiences only. Programs contain strong violence, coarse language and explicit sexual references</string>
<!-- TV content rating system strings for AU TV -->
<string name="display_name_autv" translatable="false">Australian TV Classification</string>
@@ -4917,13 +4921,13 @@
<string name="display_name_autv_ma15" translatable="false">MA 15+</string>
<string name="display_name_autv_r18" translatable="false">R 18+</string>
<string name="display_name_autv_x18" translatable="false">X 18+</string>
- <string name="description_autv_ctc">This has advertising approval, but is not yet classified</string>
- <string name="description_autv_g">The content is very mild in impact, and suitable for everyone</string>
- <string name="description_autv_pg">The content is mild in impact, but it may contain content that children find confusing or upsetting and may require the guidance or parents and guardians</string>
- <string name="description_autv_m">The content is moderate in impact, and it is recommended for teenagers aged 15 years and over</string>
- <string name="description_autv_ma15">The content is strong in impact, and it is legally restricted to persons 15 years and over</string>
- <string name="description_autv_r18">The content is high in impact, and it is restricted to adults</string>
- <string name="description_autv_x18">The content is restricted to adults. This classification is a special and legally restricted category which contains only sexually explicit content</string>
+ <string name="description_autv_ctc" translatable="false">This has advertising approval, but is not yet classified</string>
+ <string name="description_autv_g" translatable="false">The content is very mild in impact, and suitable for everyone</string>
+ <string name="description_autv_pg" translatable="false">The content is mild in impact, but it may contain content that children find confusing or upsetting and may require the guidance or parents and guardians</string>
+ <string name="description_autv_m" translatable="false">The content is moderate in impact, and it is recommended for teenagers aged 15 years and over</string>
+ <string name="description_autv_ma15" translatable="false">The content is strong in impact, and it is legally restricted to persons 15 years and over</string>
+ <string name="description_autv_r18" translatable="false">The content is high in impact, and it is restricted to adults</string>
+ <string name="description_autv_x18" translatable="false">The content is restricted to adults. This classification is a special and legally restricted category which contains only sexually explicit content</string>
<!-- TV content rating system strings for BG TV -->
<string name="display_name_bgtv" translatable="false">BG-TV</string>
@@ -4932,11 +4936,11 @@
<string name="display_name_bgtv_c" translatable="false">C</string>
<string name="display_name_bgtv_d" translatable="false">D</string>
<string name="display_name_bgtv_x" translatable="false">X</string>
- <string name="description_bgtv_a">Recommended to children. When the film confirms the ideals of humanism or popularizes the national and world cultures or contributes to upbringing children</string>
- <string name="description_bgtv_b">No restrictive recommendations from the Committee. When the film is in no way contrary to the universal rules of morality in this country, has no restrictive recommendations from the Committee and does not fall in rating A</string>
- <string name="description_bgtv_c">No persons under the age of 12 are admitted unless accompanied by an adult. When the film contains certain erotic scenes or scenes with drinking, taking drugs or stimulants or a few scenes of violence</string>
- <string name="description_bgtv_d">No persons under the age of 16 are admitted. When the film contains quite a number of erotic scenes or scenes with drinking, taking drugs or stimulants or a considerable number of scenes showing violence</string>
- <string name="description_bgtv_x">No persons under the age of 18 are admitted. When the film is naturalistically erotic or shows violence in an ostentatious manner</string>
+ <string name="description_bgtv_a" translatable="false">Recommended to children. When the film confirms the ideals of humanism or popularizes the national and world cultures or contributes to upbringing children</string>
+ <string name="description_bgtv_b" translatable="false">No restrictive recommendations from the Committee. When the film is in no way contrary to the universal rules of morality in this country, has no restrictive recommendations from the Committee and does not fall in rating A</string>
+ <string name="description_bgtv_c" translatable="false">No persons under the age of 12 are admitted unless accompanied by an adult. When the film contains certain erotic scenes or scenes with drinking, taking drugs or stimulants or a few scenes of violence</string>
+ <string name="description_bgtv_d" translatable="false">No persons under the age of 16 are admitted. When the film contains quite a number of erotic scenes or scenes with drinking, taking drugs or stimulants or a considerable number of scenes showing violence</string>
+ <string name="description_bgtv_x" translatable="false">No persons under the age of 18 are admitted. When the film is naturalistically erotic or shows violence in an ostentatious manner</string>
<!-- TV content rating system strings for BR TV -->
<string name="display_name_brtv" translatable="false">Brazil Content Rating</string>
@@ -4946,12 +4950,12 @@
<string name="display_name_brtv_14" translatable="false">14 anos</string>
<string name="display_name_brtv_16" translatable="false">16 anos</string>
<string name="display_name_brtv_18" translatable="false">18 anos</string>
- <string name="description_brtv_l">Content is suitable for all audiences</string>
- <string name="description_brtv_10">Content suitable for viewers over the age of 10</string>
- <string name="description_brtv_12">Content suitable for viewers over the age of 12</string>
- <string name="description_brtv_14">Content suitable for viewers over the age of 14</string>
- <string name="description_brtv_16">Content suitable for viewers over the age of 16</string>
- <string name="description_brtv_18">Content suitable for viewers over the age of 18</string>
+ <string name="description_brtv_l" translatable="false">Content is suitable for all audiences</string>
+ <string name="description_brtv_10" translatable="false">Content suitable for viewers over the age of 10</string>
+ <string name="description_brtv_12" translatable="false">Content suitable for viewers over the age of 12</string>
+ <string name="description_brtv_14" translatable="false">Content suitable for viewers over the age of 14</string>
+ <string name="description_brtv_16" translatable="false">Content suitable for viewers over the age of 16</string>
+ <string name="description_brtv_18" translatable="false">Content suitable for viewers over the age of 18</string>
<!-- TV content rating system strings for CA TV -->
<string name="display_name_catv" translatable="false">Canadian TV Classification System</string>
@@ -4962,20 +4966,20 @@
<string name="display_name_catv_pg" translatable="false">PG</string>
<string name="display_name_catv_14" translatable="false">14+</string>
<string name="display_name_catv_18" translatable="false">18+</string>
- <string name="description_catv_exempt">Shows which are exempt from ratings (such as news and sports programming) will not display an on-screen rating at all</string>
- <string name="description_catv_c">Programming suitable for children ages of 2–7 years. No profanity or sexual content of any level allowed. Contains little violence</string>
- <string name="description_catv_c8">Suitable for children ages 8+. Low level violence and fantasy horror is allowed. No foul language is allowed, but occasional "socially offensive and discriminatory" language is allowed if in the context of the story. No sexual content of any level allowed</string>
- <string name="description_catv_g">Suitable for general audiences. Programming suitable for the entire family with mild violence, and mild profanity and/or censored language</string>
- <string name="description_catv_pg">Parental guidance. Moderate violence and moderate profanity is allowed, as is brief nudity and sexual references if important to the context of the story</string>
- <string name="description_catv_14">Programming intended for viewers ages 14 and older. May contain strong violence and strong profanity, and depictions of sexual activity as long as they are within the context of a story</string>
- <string name="description_catv_18">Programming intended for viewers ages 18 and older. May contain explicit violence and sexual activity</string>
+ <string name="description_catv_exempt" translatable="false">Shows which are exempt from ratings (such as news and sports programming) will not display an on-screen rating at all</string>
+ <string name="description_catv_c" translatable="false">Programming suitable for children ages of 2-7 years. No profanity or sexual content of any level allowed. Contains little violence</string>
+ <string name="description_catv_c8" translatable="false">Suitable for children ages 8+. Low level violence and fantasy horror is allowed. No foul language is allowed, but occasional "socially offensive and discriminatory" language is allowed if in the context of the story. No sexual content of any level allowed</string>
+ <string name="description_catv_g" translatable="false">Suitable for general audiences. Programming suitable for the entire family with mild violence, and mild profanity and/or censored language</string>
+ <string name="description_catv_pg" translatable="false">Parental guidance. Moderate violence and moderate profanity is allowed, as is brief nudity and sexual references if important to the context of the story</string>
+ <string name="description_catv_14" translatable="false">Programming intended for viewers ages 14 and older. May contain strong violence and strong profanity, and depictions of sexual activity as long as they are within the context of a story</string>
+ <string name="description_catv_18" translatable="false">Programming intended for viewers ages 18 and older. May contain explicit violence and sexual activity</string>
<!-- TV content rating system strings for CH TV -->
<string name="display_name_chtv" translatable="false">CH-TV</string>
<string name="display_name_chtv_all" translatable="false">All ages</string>
<string name="display_name_chtv_red" translatable="false">Red rectangle</string>
- <string name="description_chtv_all">This program is suitable for all ages</string>
- <string name="description_chtv_red">This program contains scenes that may hurt sensitive people, therefore the red symbol will be displayed</string>
+ <string name="description_chtv_all" translatable="false">This program is suitable for all ages</string>
+ <string name="description_chtv_red" translatable="false">This program contains scenes that may hurt sensitive people, therefore the red symbol will be displayed</string>
<!-- TV content rating system strings for CL TV -->
<string name="display_name_cltv" translatable="false">CL-TV</string>
@@ -4986,13 +4990,13 @@
<string name="display_name_cltv_f" translatable="false">F</string>
<string name="display_name_cltv_r" translatable="false">R</string>
<string name="display_name_cltv_a" translatable="false">A</string>
- <string name="description_cltv_i">Programs suitable for all children</string>
- <string name="description_cltv_i7">Programs recommended for children ages 7 or older</string>
- <string name="description_cltv_i10">Programs recommended for children ages 10 or older</string>
- <string name="description_cltv_i12">Programs recommended for children and teens ages 12 or older</string>
- <string name="description_cltv_f">Programs suitable for a general audience, with content appropriate for all ages</string>
- <string name="description_cltv_r">Programs may content not suitable for children not accompanied by an adult</string>
- <string name="description_cltv_a">Programs suitable for adult audiences only (ages 18 or older), may contain coarse language, and sexual or explicit situations</string>
+ <string name="description_cltv_i" translatable="false">Programs suitable for all children</string>
+ <string name="description_cltv_i7" translatable="false">Programs recommended for children ages 7 or older</string>
+ <string name="description_cltv_i10" translatable="false">Programs recommended for children ages 10 or older</string>
+ <string name="description_cltv_i12" translatable="false">Programs recommended for children and teens ages 12 or older</string>
+ <string name="description_cltv_f" translatable="false">Programs suitable for a general audience, with content appropriate for all ages</string>
+ <string name="description_cltv_r" translatable="false">Programs may content not suitable for children not accompanied by an adult</string>
+ <string name="description_cltv_a" translatable="false">Programs suitable for adult audiences only (ages 18 or older), may contain coarse language, and sexual or explicit situations</string>
<!-- TV content rating system strings for DE TV -->
<string name="display_name_detv" translatable="false">DE-TV</string>
@@ -5000,10 +5004,10 @@
<string name="display_name_detv_12" translatable="false">ab 12 Jahren</string>
<string name="display_name_detv_16" translatable="false">ab 16 Jahren</string>
<string name="display_name_detv_18" translatable="false">ab 18 Jahren</string>
- <string name="description_detv_all">The program is suitable for all ages</string>
- <string name="description_detv_12">The program is not suitable for viewers under the age of 12</string>
- <string name="description_detv_16">The program is not suitable for viewers under the age of 16</string>
- <string name="description_detv_18">The program is not suitable for viewers under the age of 18</string>
+ <string name="description_detv_all" translatable="false">The program is suitable for all ages</string>
+ <string name="description_detv_12" translatable="false">The program is not suitable for viewers under the age of 12</string>
+ <string name="description_detv_16" translatable="false">The program is not suitable for viewers under the age of 16</string>
+ <string name="description_detv_18" translatable="false">The program is not suitable for viewers under the age of 18</string>
<!-- TV content rating system strings for DK TV -->
<string name="display_name_dktv" translatable="false">DK-TV</string>
@@ -5011,10 +5015,10 @@
<string name="display_name_dktv_y" translatable="false">Yellow symbol</string>
<string name="display_name_dktv_r" translatable="false">Red symbol</string>
<string name="display_name_dktv_b" translatable="false">Blue symbol</string>
- <string name="description_dktv_g">programs suitable for all ages</string>
- <string name="description_dktv_y">programs suitable children accompanied by an adult</string>
- <string name="description_dktv_r">programs containing material with more intensive content </string>
- <string name="description_dktv_b">programs containing explicit content and strictly for adults only</string>
+ <string name="description_dktv_g" translatable="false">programs suitable for all ages</string>
+ <string name="description_dktv_y" translatable="false">programs suitable children accompanied by an adult</string>
+ <string name="description_dktv_r" translatable="false">programs containing material with more intensive content </string>
+ <string name="description_dktv_b" translatable="false">programs containing explicit content and strictly for adults only</string>
<!-- TV content rating system strings for ES TV -->
<string name="display_name_estv" translatable="false">ES-TV</string>
@@ -5025,13 +5029,13 @@
<string name="display_name_estv_12" translatable="false">12</string>
<string name="display_name_estv_16" translatable="false">16</string>
<string name="display_name_estv_18" translatable="false">18</string>
- <string name="description_estv_tp">Recommended for all ages</string>
- <string name="description_estv_i">Specially recommended for preschoolers and kids</string>
- <string name="description_estv_7">Recommended for people older than 7 years old</string>
- <string name="description_estv_7i">Recommended for kids older than 7 years old</string>
- <string name="description_estv_12">Recommended for people older than 12 years old</string>
- <string name="description_estv_16">Recommended for people older than 16 years old</string>
- <string name="description_estv_18">Recommended for people older than 18 years old</string>
+ <string name="description_estv_tp" translatable="false">Recommended for all ages</string>
+ <string name="description_estv_i" translatable="false">Specially recommended for preschoolers and kids</string>
+ <string name="description_estv_7" translatable="false">Recommended for people older than 7 years old</string>
+ <string name="description_estv_7i" translatable="false">Recommended for kids older than 7 years old</string>
+ <string name="description_estv_12" translatable="false">Recommended for people older than 12 years old</string>
+ <string name="description_estv_16" translatable="false">Recommended for people older than 16 years old</string>
+ <string name="description_estv_18" translatable="false">Recommended for people older than 18 years old</string>
<!-- TV content rating system strings for FI TV -->
<string name="display_name_fitv" translatable="false">FI-TV</string>
@@ -5040,11 +5044,11 @@
<string name="display_name_fitv_k12" translatable="false">K12</string>
<string name="display_name_fitv_k16" translatable="false">K16</string>
<string name="display_name_fitv_k18" translatable="false">K18</string>
- <string name="description_fitv_s">Allowed at all times</string>
- <string name="description_fitv_k7">Not recommended for children under 7</string>
- <string name="description_fitv_k12">Not recommended for children under 12</string>
- <string name="description_fitv_k16">Not recommended for children under 16</string>
- <string name="description_fitv_k18">Not recommended for children under 18</string>
+ <string name="description_fitv_s" translatable="false">Allowed at all times</string>
+ <string name="description_fitv_k7" translatable="false">Not recommended for children under 7</string>
+ <string name="description_fitv_k12" translatable="false">Not recommended for children under 12</string>
+ <string name="description_fitv_k16" translatable="false">Not recommended for children under 16</string>
+ <string name="description_fitv_k18" translatable="false">Not recommended for children under 18</string>
<!-- TV content rating system strings for FR TV -->
<string name="display_name_frtv" translatable="false">FR-TV</string>
@@ -5053,11 +5057,11 @@
<string name="display_name_frtv_12" translatable="false">Déconseillé aux -12 ans</string>
<string name="display_name_frtv_16" translatable="false">Déconseillé aux -16 ans</string>
<string name="display_name_frtv_18" translatable="false">Déconseillé aux -18 ans</string>
- <string name="description_frtv_all">Appropriate for all ages</string>
- <string name="description_frtv_10">Not recommended for children under 10</string>
- <string name="description_frtv_12">Not recommended for children under 12</string>
- <string name="description_frtv_16">Not recommended for children under 16</string>
- <string name="description_frtv_18">Not recommended for persons under 18</string>
+ <string name="description_frtv_all" translatable="false">Appropriate for all ages</string>
+ <string name="description_frtv_10" translatable="false">Not recommended for children under 10</string>
+ <string name="description_frtv_12" translatable="false">Not recommended for children under 12</string>
+ <string name="description_frtv_16" translatable="false">Not recommended for children under 16</string>
+ <string name="description_frtv_18" translatable="false">Not recommended for persons under 18</string>
<!-- TV content rating system strings for GR TV -->
<string name="display_name_grtv" translatable="false">GR-TV</string>
@@ -5066,20 +5070,20 @@
<string name="display_name_grtv_12" translatable="false">White triangle in orange background</string>
<string name="display_name_grtv_15" translatable="false">White square in purple background</string>
<string name="display_name_grtv_18" translatable="false">White X in red background</string>
- <string name="description_grtv_all">Suitable for all ages</string>
- <string name="description_grtv_10">Parental consent suggested</string>
- <string name="description_grtv_12">Required parental consent</string>
- <string name="description_grtv_15">Suitable for minors over the age of 15</string>
- <string name="description_grtv_18">Suitable only for adults profanity before midnight is punishable by fine, except when used in the context of the program</string>
+ <string name="description_grtv_all" translatable="false">Suitable for all ages</string>
+ <string name="description_grtv_10" translatable="false">Parental consent suggested</string>
+ <string name="description_grtv_12" translatable="false">Required parental consent</string>
+ <string name="description_grtv_15" translatable="false">Suitable for minors over the age of 15</string>
+ <string name="description_grtv_18" translatable="false">Suitable only for adults profanity before midnight is punishable by fine, except when used in the context of the program</string>
<!-- TV content rating system strings for HK TV -->
<string name="display_name_hktv" translatable="false">HK-TV</string>
<string name="display_name_hktv_g" translatable="false">G</string>
<string name="display_name_hktv_pg" translatable="false">PG</string>
<string name="display_name_hktv_m" translatable="false">M</string>
- <string name="description_hktv_g">For general audiences</string>
- <string name="description_hktv_pg">Programs are unsuitable for children, parental guidance is recommended</string>
- <string name="description_hktv_m">Programs are recommended only for adult viewers above the age of 18</string>
+ <string name="description_hktv_g" translatable="false">For general audiences</string>
+ <string name="description_hktv_pg" translatable="false">Programs are unsuitable for children, parental guidance is recommended</string>
+ <string name="description_hktv_m" translatable="false">Programs are recommended only for adult viewers above the age of 18</string>
<!-- TV content rating system strings for HU TV -->
<string name="display_name_hutv" translatable="false">HU-TV</string>
@@ -5089,12 +5093,12 @@
<string name="display_name_hutv_12" translatable="false">12</string>
<string name="display_name_hutv_16" translatable="false">16</string>
<string name="display_name_hutv_18" translatable="false">18</string>
- <string name="description_hutv_u">Programs can be viewed by any age</string>
- <string name="description_hutv_cf">Programs recommended for children. It is an optional rating, there is no obligation for broadcasters to indicate it</string>
- <string name="description_hutv_6">Programs not recommended for children below the age of 6, may not contain any violence or sexual content</string>
- <string name="description_hutv_12">Programs not recommended for children below the age of 12, may contain light sexual content or explicit language</string>
- <string name="description_hutv_16">Programs not recommended for teens and children below the age of 16, may contain more intensive violence and sexual content</string>
- <string name="description_hutv_18">The program is recommended only for adult viewers (for ages 18 and up), may contain explicit violence and explicit sexual content</string>
+ <string name="description_hutv_u" translatable="false">Programs can be viewed by any age</string>
+ <string name="description_hutv_cf" translatable="false">Programs recommended for children. It is an optional rating, there is no obligation for broadcasters to indicate it</string>
+ <string name="description_hutv_6" translatable="false">Programs not recommended for children below the age of 6, may not contain any violence or sexual content</string>
+ <string name="description_hutv_12" translatable="false">Programs not recommended for children below the age of 12, may contain light sexual content or explicit language</string>
+ <string name="description_hutv_16" translatable="false">Programs not recommended for teens and children below the age of 16, may contain more intensive violence and sexual content</string>
+ <string name="description_hutv_18" translatable="false">The program is recommended only for adult viewers (for ages 18 and up), may contain explicit violence and explicit sexual content</string>
<!-- TV content rating system strings for ID TV -->
<string name="display_name_idtv" translatable="false">ID-TV</string>
@@ -5106,14 +5110,14 @@
<string name="display_name_idtv_r" translatable="false">R</string>
<string name="display_name_idtv_r_bo" translatable="false">R-BO</string>
<string name="display_name_idtv_d" translatable="false">D</string>
- <string name="description_idtv_p">Suitable for children from ages 2 through 11</string>
- <string name="description_idtv_a">Suitable for teens and children from ages 7 through 16</string>
- <string name="description_idtv_a_bo">Suitable for children ages 5 through 10, with parental guidance or permission</string>
- <string name="description_idtv_su">Suitable for general audiences</string>
- <string name="description_idtv_bo">Parental guidance suggested for ages 5 and under</string>
- <string name="description_idtv_r">Suitable for teens from ages 13 through 17</string>
- <string name="description_idtv_r_bo">Suitable for teens with parental guidance or permission</string>
- <string name="description_idtv_d">Suitable for viewers over 18 and older only</string>
+ <string name="description_idtv_p" translatable="false">Suitable for children from ages 2 through 11</string>
+ <string name="description_idtv_a" translatable="false">Suitable for teens and children from ages 7 through 16</string>
+ <string name="description_idtv_a_bo" translatable="false">Suitable for children ages 5 through 10, with parental guidance or permission</string>
+ <string name="description_idtv_su" translatable="false">Suitable for general audiences</string>
+ <string name="description_idtv_bo" translatable="false">Parental guidance suggested for ages 5 and under</string>
+ <string name="description_idtv_r" translatable="false">Suitable for teens from ages 13 through 17</string>
+ <string name="description_idtv_r_bo" translatable="false">Suitable for teens with parental guidance or permission</string>
+ <string name="description_idtv_d" translatable="false">Suitable for viewers over 18 and older only</string>
<!-- TV content rating system strings for IE TV -->
<string name="display_name_ietv" translatable="false">RTÉ programme classifications</string>
@@ -5122,11 +5126,11 @@
<string name="display_name_ietv_ya" translatable="false">YA</string>
<string name="display_name_ietv_ps" translatable="false">PS</string>
<string name="display_name_ietv_ma" translatable="false">MA</string>
- <string name="description_ietv_ga">Suitable for all ages</string>
- <string name="description_ietv_ch">Suitable for children ages 5 to 10, may contain comedic violence or action fantasy violence</string>
- <string name="description_ietv_ya">Suitable for adolescent audiences, may contain thematic elements that would appeal to teenagers</string>
- <string name="description_ietv_ps">Suitable for more mature viewers, more mature themes may be present</string>
- <string name="description_ietv_ma">Most restrictive classification, allowing for heavy subject matter and coarse language</string>
+ <string name="description_ietv_ga" translatable="false">Suitable for all ages</string>
+ <string name="description_ietv_ch" translatable="false">Suitable for children ages 5 to 10, may contain comedic violence or action fantasy violence</string>
+ <string name="description_ietv_ya" translatable="false">Suitable for adolescent audiences, may contain thematic elements that would appeal to teenagers</string>
+ <string name="description_ietv_ps" translatable="false">Suitable for more mature viewers, more mature themes may be present</string>
+ <string name="description_ietv_ma" translatable="false">Most restrictive classification, allowing for heavy subject matter and coarse language</string>
<!-- TV content rating system strings for IL TV -->
<string name="display_name_iltv" translatable="false">IL-TV</string>
@@ -5135,11 +5139,11 @@
<string name="display_name_iltv_15" translatable="false">15+</string>
<string name="display_name_iltv_18" translatable="false">18+</string>
<string name="display_name_iltv_e" translatable="false">E</string>
- <string name="description_iltv_g">General audience; anyone, regardless of age, can view the program, usually news and children\'s programming</string>
- <string name="description_iltv_12">Suitable for teens and children ages 12 and over, no child under 12 are permitted to view the program</string>
- <string name="description_iltv_15">Suitable for teens ages 15 and over, no child under 15 may view the programme</string>
- <string name="description_iltv_18">Suitable for adults only, no minors may view the programme</string>
- <string name="description_iltv_e">Exempt from classification</string>
+ <string name="description_iltv_g" translatable="false">General audience; anyone, regardless of age, can view the program, usually news and children\'s programming</string>
+ <string name="description_iltv_12" translatable="false">Suitable for teens and children ages 12 and over, no child under 12 are permitted to view the program</string>
+ <string name="description_iltv_15" translatable="false">Suitable for teens ages 15 and over, no child under 15 may view the programme</string>
+ <string name="description_iltv_18" translatable="false">Suitable for adults only, no minors may view the programme</string>
+ <string name="description_iltv_e" translatable="false">Exempt from classification</string>
<!-- TV content rating system strings for IN TV -->
<string name="display_name_intv" translatable="false">IN-TV</string>
@@ -5147,10 +5151,10 @@
<string name="display_name_intv_u/a" translatable="false">U/A</string>
<string name="display_name_intv_a" translatable="false">A</string>
<string name="display_name_intv_s" translatable="false">S</string>
- <string name="description_intv_u">Unrestricted public exhibition</string>
- <string name="description_intv_u/a">Unrestricted public exhibition, but with a caution regarding parental guidance to those under 12 years of age</string>
- <string name="description_intv_a">Public exhibition restricted to adults 18 years of age and older only</string>
- <string name="description_intv_s">Public exhibition restricted to members of any profession or any class of persons</string>
+ <string name="description_intv_u" translatable="false">Unrestricted public exhibition</string>
+ <string name="description_intv_u/a" translatable="false">Unrestricted public exhibition, but with a caution regarding parental guidance to those under 12 years of age</string>
+ <string name="description_intv_a" translatable="false">Public exhibition restricted to adults 18 years of age and older only</string>
+ <string name="description_intv_s" translatable="false">Public exhibition restricted to members of any profession or any class of persons</string>
<!-- TV content rating system strings for IS TV -->
<string name="display_name_istv" translatable="false">IS-TV</string>
@@ -5161,13 +5165,13 @@
<string name="display_name_istv_14" translatable="false">14</string>
<string name="display_name_istv_16" translatable="false">16</string>
<string name="display_name_istv_18" translatable="false">18</string>
- <string name="description_istv_l">Programs suitable for all ages</string>
- <string name="description_istv_7">Programs suitable for ages 7 and older</string>
- <string name="description_istv_10">Programs suitable for ages 10 and older</string>
- <string name="description_istv_12">Programs suitable for ages 12 and older</string>
- <string name="description_istv_14">Programs suitable for ages 14 and older</string>
- <string name="description_istv_16">Programs suitable for ages 16 and older</string>
- <string name="description_istv_18">Programs suitable for ages 18 and older</string>
+ <string name="description_istv_l" translatable="false">Programs suitable for all ages</string>
+ <string name="description_istv_7" translatable="false">Programs suitable for ages 7 and older</string>
+ <string name="description_istv_10" translatable="false">Programs suitable for ages 10 and older</string>
+ <string name="description_istv_12" translatable="false">Programs suitable for ages 12 and older</string>
+ <string name="description_istv_14" translatable="false">Programs suitable for ages 14 and older</string>
+ <string name="description_istv_16" translatable="false">Programs suitable for ages 16 and older</string>
+ <string name="description_istv_18" translatable="false">Programs suitable for ages 18 and older</string>
<!-- TV content rating system strings for KR TV -->
<string name="display_name_krtv" translatable="false">KR-TV</string>
@@ -5176,11 +5180,11 @@
<string name="display_name_krtv_12" translatable="false">12세이상시청가</string>
<string name="display_name_krtv_15" translatable="false">15세이상시청가</string>
<string name="display_name_krtv_19" translatable="false">19세이상시청가</string>
- <string name="description_krtv_all">Appropriate for all ages</string>
- <string name="description_krtv_7">May contain material inappropriate for children younger than 7, and parental discretion should be used</string>
- <string name="description_krtv_12">May deemed inappropriate for those younger than 12, and parental discretion should be used</string>
- <string name="description_krtv_15">May be inappropriate for children under 15, and that parental discretion should be used</string>
- <string name="description_krtv_19">For adults only</string>
+ <string name="description_krtv_all" translatable="false">Appropriate for all ages</string>
+ <string name="description_krtv_7" translatable="false">May contain material inappropriate for children younger than 7, and parental discretion should be used</string>
+ <string name="description_krtv_12" translatable="false">May deemed inappropriate for those younger than 12, and parental discretion should be used</string>
+ <string name="description_krtv_15" translatable="false">May be inappropriate for children under 15, and that parental discretion should be used</string>
+ <string name="description_krtv_19" translatable="false">For adults only</string>
<!-- TV content rating system strings for MV TV -->
<string name="display_name_mvtv" translatable="false">MV-TV</string>
@@ -5193,15 +5197,15 @@
<string name="display_name_mvtv_18" translatable="false">18+</string>
<string name="display_name_mvtv_21" translatable="false">21+</string>
<string name="display_name_mvtv_x" translatable="false">X</string>
- <string name="description_mvtv_y">Young children</string>
- <string name="description_mvtv_g">General viewing for all ages</string>
- <string name="description_mvtv_pg">Parental guidance is required unaccompanied children</string>
- <string name="description_mvtv_pg-12">Parental guidance is required for children under the age of 12</string>
- <string name="description_mvtv_12">Teens and children aged 12 and older may watch, otherwise restricted</string>
- <string name="description_mvtv_15">Restricted to viewers aged 15 and above</string>
- <string name="description_mvtv_18">Restricted to viewers aged 18 and above</string>
- <string name="description_mvtv_21">Restricted to viewers aged 21 and above</string>
- <string name="description_mvtv_x">Most restrictive classification, only adults ages 25 and above may view</string>
+ <string name="description_mvtv_y" translatable="false">Young children</string>
+ <string name="description_mvtv_g" translatable="false">General viewing for all ages</string>
+ <string name="description_mvtv_pg" translatable="false">Parental guidance is required unaccompanied children</string>
+ <string name="description_mvtv_pg-12" translatable="false">Parental guidance is required for children under the age of 12</string>
+ <string name="description_mvtv_12" translatable="false">Teens and children aged 12 and older may watch, otherwise restricted</string>
+ <string name="description_mvtv_15" translatable="false">Restricted to viewers aged 15 and above</string>
+ <string name="description_mvtv_18" translatable="false">Restricted to viewers aged 18 and above</string>
+ <string name="description_mvtv_21" translatable="false">Restricted to viewers aged 21 and above</string>
+ <string name="description_mvtv_x" translatable="false">Most restrictive classification, only adults ages 25 and above may view</string>
<!-- TV content rating system strings for MX TV -->
<string name="display_name_mxtv" translatable="false">MX-TV</string>
@@ -5211,21 +5215,21 @@
<string name="display_name_mxtv_c" translatable="false">C</string>
<string name="display_name_mxtv_d" translatable="false">D</string>
<string name="display_name_mxtv_rc" translatable="false">RC</string>
- <string name="description_mxtv_a">Appropriate for all ages, parental guidance is recommended for children under 7 years</string>
- <string name="description_mxtv_b">Designed for ages 12 and older, may contain some sexual situations, mild violence, and mild language</string>
- <string name="description_mxtv_b-15">Designed for ages 15 and up, slightly more intensive than the \'A\' and \'B\' ratings</string>
- <string name="description_mxtv_c">Designed to be viewed by adults aged 18 or older only, generally more intensive content </string>
- <string name="description_mxtv_d">Designed to be viewed only by mature adults (at least 21 years of age and over), contains extreme content matter</string>
- <string name="description_mxtv_rc">Banned from public television in Mexico</string>
+ <string name="description_mxtv_a" translatable="false">Appropriate for all ages, parental guidance is recommended for children under 7 years</string>
+ <string name="description_mxtv_b" translatable="false">Designed for ages 12 and older, may contain some sexual situations, mild violence, and mild language</string>
+ <string name="description_mxtv_b-15" translatable="false">Designed for ages 15 and up, slightly more intensive than the \'A\' and \'B\' ratings</string>
+ <string name="description_mxtv_c" translatable="false">Designed to be viewed by adults aged 18 or older only, generally more intensive content </string>
+ <string name="description_mxtv_d" translatable="false">Designed to be viewed only by mature adults (at least 21 years of age and over), contains extreme content matter</string>
+ <string name="description_mxtv_rc" translatable="false">Banned from public television in Mexico</string>
<!-- TV content rating system strings for MY TV -->
<string name="display_name_mytv" translatable="false">MY-TV</string>
<string name="display_name_mytv_u" translatable="false">U</string>
<string name="display_name_mytv_p13" translatable="false">P13</string>
<string name="display_name_mytv_18" translatable="false">18</string>
- <string name="description_mytv_u">General viewing for all ages, can be broadcast anytime</string>
- <string name="description_mytv_p13">For viewers ages 13 and above, children under 13 needs parental guidance, can be broadcast anytime, but some elements may only be broadcast at night</string>
- <string name="description_mytv_18">For viewers ages 18 and above only</string>
+ <string name="description_mytv_u" translatable="false">General viewing for all ages, can be broadcast anytime</string>
+ <string name="description_mytv_p13" translatable="false">For viewers ages 13 and above, children under 13 needs parental guidance, can be broadcast anytime, but some elements may only be broadcast at night</string>
+ <string name="description_mytv_18" translatable="false">For viewers ages 18 and above only</string>
<!-- TV content rating system strings for NL TV -->
<string name="display_name_nltv" translatable="false">NICAM</string>
@@ -5240,31 +5244,31 @@
<string name="display_name_nltv_9" translatable="false">Let op met kinderen tot 9 jaar</string>
<string name="display_name_nltv_12" translatable="false">Let op met kinderen tot 12 jaar</string>
<string name="display_name_nltv_16" translatable="false">Let op met kinderen tot 16 jaar</string>
- <string name="description_nltv_v">Violence</string>
- <string name="description_nltv_f">Scary or Disturbing Content </string>
- <string name="description_nltv_s">Sexual Content</string>
- <string name="description_nltv_d">Discrimination</string>
- <string name="description_nltv_da">Drug and/or Alcohol abuse</string>
- <string name="description_nltv_l">Bad Language</string>
- <string name="description_nltv_al">All Ages</string>
- <string name="description_nltv_6">Parental advisory for children under 6</string>
- <string name="description_nltv_9">Parental advisory for children under 9</string>
- <string name="description_nltv_12">Parental advisory for children under 12</string>
- <string name="description_nltv_16">Parental advisory for children under 16</string>
+ <string name="description_nltv_v" translatable="false">Violence\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_f" translatable="false">Scary or Disturbing ContentViolence\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_s" translatable="false">Sexual Content\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_d" translatable="false">Discrimination\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_da" translatable="false">Drug and/or Alcohol abuse\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_l" translatable="false">Bad Language\nApplicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</string>
+ <string name="description_nltv_al" translatable="false">All Ages</string>
+ <string name="description_nltv_6" translatable="false">Parental advisory for children under 6</string>
+ <string name="description_nltv_9" translatable="false">Parental advisory for children under 9</string>
+ <string name="description_nltv_12" translatable="false">Parental advisory for children under 12</string>
+ <string name="description_nltv_16" translatable="false">Parental advisory for children under 16</string>
<!-- TV content rating system strings for NZF(Free) TV -->
<string name="display_name_nzftv" translatable="false">NZ-Free-TV</string>
- <string name="description_nzftv">New Zealand\'s free-to-air TV content rating system</string>
+ <string name="description_nzftv" translatable="false">TV content rating system for free-to-air channels in New Zealand</string>
<string name="display_name_nzftv_g" translatable="false">G</string>
<string name="display_name_nzftv_pgr" translatable="false">PGR</string>
<string name="display_name_nzftv_ao" translatable="false">AO</string>
- <string name="description_nzftv_g">These exclude material likely to harm children under 14 and can screen at any time. Programmes may not necessarily be designed for younger viewers, but must not contain material likely to cause them undue distress or discomfort</string>
- <string name="description_nzftv_pgr">Programmes more suited to more mature viewers. These are not necessarily unsuitable for children, but viewer discretion is advised, and parents and guardians are encouraged to supervise younger viewers</string>
- <string name="description_nzftv_ao">Contain material of an adult nature handled in such a way that it is unsuitable for children</string>
+ <string name="description_nzftv_g" translatable="false">These exclude material likely to harm children under 14 and can screen at any time. Programmes may not necessarily be designed for younger viewers, but must not contain material likely to cause them undue distress or discomfort</string>
+ <string name="description_nzftv_pgr" translatable="false">Programmes more suited to more mature viewers. These are not necessarily unsuitable for children, but viewer discretion is advised, and parents and guardians are encouraged to supervise younger viewers</string>
+ <string name="description_nzftv_ao" translatable="false">Contain material of an adult nature handled in such a way that it is unsuitable for children</string>
<!-- TV content rating system strings for NZP(Pay) TV -->
<string name="display_name_nzptv" translatable="false">NZ-Pay-TV</string>
- <string name="description_nzptv">New Zealand\'s pay TV content rating system</string>
+ <string name="description_nzptv" translatable="false">TV content rating system for Pay TV channels in New Zealand</string>
<string name="display_name_nzptv_c" translatable="false">C</string>
<string name="display_name_nzptv_v" translatable="false">V</string>
<string name="display_name_nzptv_l" translatable="false">L</string>
@@ -5274,46 +5278,46 @@
<string name="display_name_nzptv_m" translatable="false">M</string>
<string name="display_name_nzptv_16" translatable="false">16</string>
<string name="display_name_nzptv_18" translatable="false">18</string>
- <string name="description_nzptv_c">Content may offend</string>
- <string name="description_nzptv_v">Violence</string>
- <string name="description_nzptv_l">Language</string>
- <string name="description_nzptv_s">Sexual content</string>
- <string name="description_nzptv_g">suitable for general audiences</string>
- <string name="description_nzptv_pg">Parental guidance recommended for under 10</string>
- <string name="description_nzptv_m">Suitable for mature audiences 13 and up</string>
- <string name="description_nzptv_16">Suitable for viewers 16 and up</string>
- <string name="description_nzptv_18">Suitable for viewers 18 and up</string>
+ <string name="description_nzptv_c" translatable="false">Content may offend\nApplicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</string>
+ <string name="description_nzptv_v" translatable="false">Violence\nApplicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</string>
+ <string name="description_nzptv_l" translatable="false">Language\nApplicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</string>
+ <string name="description_nzptv_s" translatable="false">Sexual content\nApplicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</string>
+ <string name="description_nzptv_g" translatable="false">suitable for general audiences</string>
+ <string name="description_nzptv_pg" translatable="false">Parental guidance recommended for under 10</string>
+ <string name="description_nzptv_m" translatable="false">Suitable for mature audiences 13 and up</string>
+ <string name="description_nzptv_16" translatable="false">Suitable for viewers 16 and up</string>
+ <string name="description_nzptv_18" translatable="false">Suitable for viewers 18 and up</string>
<!-- TV content rating system strings for PE TV -->
<string name="display_name_petv" translatable="false">PE-TV</string>
- <string name="description_petv">TV content rating system for some Peruvian channels in Peru</string>
+ <string name="description_petv" translatable="false">TV content rating system for some Peruvian channels in Peru</string>
<string name="display_name_petv_a" translatable="false">Apt</string>
<string name="display_name_petv_14" translatable="false">14</string>
<string name="display_name_petv_18" translatable="false">18</string>
- <string name="description_petv_a">Suitable for all audiences</string>
- <string name="description_petv_14">Suitable for people aged 14 and above only</string>
- <string name="description_petv_18">Suitable for people aged 18 and above only</string>
+ <string name="description_petv_a" translatable="false">Suitable for all audiences</string>
+ <string name="description_petv_14" translatable="false">Suitable for people aged 14 and above only</string>
+ <string name="description_petv_18" translatable="false">Suitable for people aged 18 and above only</string>
<!-- TV content rating system strings for America TV in PE -->
<string name="display_name_peatv" translatable="false">PE-ATV</string>
- <string name="description_peatv">TV content rating system for America Television in Peru that uses its own rating system</string>
+ <string name="description_peatv" translatable="false">TV content rating system for America Television in Peru that uses its own rating system</string>
<string name="display_name_peatv_gp" translatable="false">GP</string>
<string name="display_name_peatv_pg" translatable="false">PG</string>
<string name="display_name_peatv_14" translatable="false">TV-14</string>
<string name="display_name_peatv_18" translatable="false">TV-18</string>
- <string name="description_peatv_gp">General audience</string>
- <string name="description_peatv_pg">Parental guidance required for under 6</string>
- <string name="description_peatv_14">Suitable for people aged 14 and above only</string>
- <string name="description_peatv_18">Suitable for people aged 18 and above only</string>
+ <string name="description_peatv_gp" translatable="false">General audience</string>
+ <string name="description_peatv_pg" translatable="false">Parental guidance required for under 6</string>
+ <string name="description_peatv_14" translatable="false">Suitable for people aged 14 and above only</string>
+ <string name="description_peatv_18" translatable="false">Suitable for people aged 18 and above only</string>
<!-- TV content rating system strings for PH TV -->
<string name="display_name_phtv" translatable="false">MTRCB</string>
<string name="display_name_phtv_g" translatable="false">G</string>
<string name="display_name_phtv_pg" translatable="false">PG</string>
<string name="display_name_phtv_spg" translatable="false">SPG</string>
- <string name="description_phtv_g">Suitable for all public viewers</string>
- <string name="description_phtv_pg">Programmes rated PG may contain scenes or other content that are unsuitable for children without the guidance of a parent</string>
- <string name="description_phtv_spg">Contains mature themes or moderate to intense violence, which may be deemed unfit for children to watch without strict parental supervision</string>
+ <string name="description_phtv_g" translatable="false">Suitable for all public viewers</string>
+ <string name="description_phtv_pg" translatable="false">Programmes rated PG may contain scenes or other content that are unsuitable for children without the guidance of a parent</string>
+ <string name="description_phtv_spg" translatable="false">Contains mature themes or moderate to intense violence, which may be deemed unfit for children to watch without strict parental supervision</string>
<!-- TV content rating system strings for PL TV -->
<string name="display_name_pltv" translatable="false">PL-TV</string>
@@ -5322,11 +5326,11 @@
<string name="display_name_pltv_12" translatable="false">12</string>
<string name="display_name_pltv_16" translatable="false">16</string>
<string name="display_name_pltv_18" translatable="false">18</string>
- <string name="description_pltv_g">Positive or neutral view of the world, little to no violence, non-sexual love, and no sexual content</string>
- <string name="description_pltv_7">Age 7 and above. May additionally contain some mild language, bloodless violence, and a more negative view of the world</string>
- <string name="description_pltv_12">Age 12 and above. May contain some foul language, some violence, and some sexual content</string>
- <string name="description_pltv_16">Age 16 and above. Deviant social behaviour, world filled with violence and sexuality, simplified picture of adulthood, display of physical force, especially in controversial social context, immoral behaviour without ethic dilemma, putting the blame on the victim, excessive concentration on material possessions</string>
- <string name="description_pltv_18">Age 18 and above. One-sided display of the joys of adult life without showing responsibilities, social justification of violent behaviour, excessive vulgarity, use of racial slurs and social stereotypes, explicit sexual content, praise of aggression or vulgarity</string>
+ <string name="description_pltv_g" translatable="false">Positive or neutral view of the world, little to no violence, non-sexual love, and no sexual content</string>
+ <string name="description_pltv_7" translatable="false">Age 7 and above. May additionally contain some mild language, bloodless violence, and a more negative view of the world</string>
+ <string name="description_pltv_12" translatable="false">Age 12 and above. May contain some foul language, some violence, and some sexual content</string>
+ <string name="description_pltv_16" translatable="false">Age 16 and above. Deviant social behaviour, world filled with violence and sexuality, simplified picture of adulthood, display of physical force, especially in controversial social context, immoral behaviour without ethic dilemma, putting the blame on the victim, excessive concentration on material possessions</string>
+ <string name="description_pltv_18" translatable="false">Age 18 and above. One-sided display of the joys of adult life without showing responsibilities, social justification of violent behaviour, excessive vulgarity, use of racial slurs and social stereotypes, explicit sexual content, praise of aggression or vulgarity</string>
<!-- TV content rating system strings for PT TV -->
<string name="display_name_pttv" translatable="false">PT-TV</string>
@@ -5334,10 +5338,10 @@
<string name="display_name_pttv_10" translatable="false">10</string>
<string name="display_name_pttv_12" translatable="false">12</string>
<string name="display_name_pttv_16" translatable="false">16</string>
- <string name="description_pttv_t">Suitable for all</string>
- <string name="description_pttv_10">May not be suitable for children under 10, parental guidance advised</string>
- <string name="description_pttv_12">May not be suitable for children under 12, parental guidance advised</string>
- <string name="description_pttv_16">Not suitable for children under 16</string>
+ <string name="description_pttv_t" translatable="false">Suitable for all</string>
+ <string name="description_pttv_10" translatable="false">May not be suitable for children under 10, parental guidance advised</string>
+ <string name="description_pttv_12" translatable="false">May not be suitable for children under 12, parental guidance advised</string>
+ <string name="description_pttv_16" translatable="false">Not suitable for children under 16</string>
<!-- TV content rating system strings for RO TV -->
<string name="display_name_rotv" translatable="false">RO-TV</string>
@@ -5347,12 +5351,12 @@
<string name="display_name_rotv_12" translatable="false">12</string>
<string name="display_name_rotv_15" translatable="false">15</string>
<string name="display_name_rotv_18" translatable="false">18</string>
- <string name="description_rotv_y">Young Ages</string>
- <string name="description_rotv_g">General Exhibition</string>
- <string name="description_rotv_ap">Parental guidance is recommended for children below the age of 12</string>
- <string name="description_rotv_12">Forbidden for children under 12 years of age</string>
- <string name="description_rotv_15">Forbidden for children under 15 years of age</string>
- <string name="description_rotv_18">Forbidden for children under 18 years of age</string>
+ <string name="description_rotv_y" translatable="false">Young Ages</string>
+ <string name="description_rotv_g" translatable="false">General Exhibition</string>
+ <string name="description_rotv_ap" translatable="false">Parental guidance is recommended for children below the age of 12</string>
+ <string name="description_rotv_12" translatable="false">Forbidden for children under 12 years of age</string>
+ <string name="description_rotv_15" translatable="false">Forbidden for children under 15 years of age</string>
+ <string name="description_rotv_18" translatable="false">Forbidden for children under 18 years of age</string>
<!-- TV content rating system strings for RU TV -->
<string name="display_name_rutv" translatable="false">RU-TV</string>
@@ -5361,11 +5365,11 @@
<string name="display_name_rutv_12" translatable="false">12+</string>
<string name="display_name_rutv_16" translatable="false">16+</string>
<string name="display_name_rutv_18" translatable="false">18+</string>
- <string name="description_rutv_0">Can be watched by Any Age</string>
- <string name="description_rutv_6">Only kids the age of 6 or older can watch</string>
- <string name="description_rutv_12">Only kids the age of 12 or older can watch</string>
- <string name="description_rutv_16">Only teens the age of 16 or older can watch</string>
- <string name="description_rutv_18">Restricted to children ONLY people 18 or older</string>
+ <string name="description_rutv_0" translatable="false">Can be watched by Any Age</string>
+ <string name="description_rutv_6" translatable="false">Only kids the age of 6 or older can watch</string>
+ <string name="description_rutv_12" translatable="false">Only kids the age of 12 or older can watch</string>
+ <string name="description_rutv_16" translatable="false">Only teens the age of 16 or older can watch</string>
+ <string name="description_rutv_18" translatable="false">Restricted to children ONLY people 18 or older</string>
<!-- TV content rating system strings for RS TV -->
<string name="display_name_rstv" translatable="false">RS-TV</string>
@@ -5376,27 +5380,27 @@
<string name="display_name_rstv_16" translatable="false">16</string>
<string name="display_name_rstv_17" translatable="false">17</string>
<string name="display_name_rstv_18" translatable="false">18</string>
- <string name="description_rstv_g">Program suitable for all ages</string>
- <string name="description_rstv_12">Program not suitable for children under the age of 12 </string>
- <string name="description_rstv_14">Program not suitable for children/teens under the age of 14</string>
- <string name="description_rstv_15">Program not suitable for children/teens under the age of 15</string>
- <string name="description_rstv_16">Program not suitable for children/teens under the age of 16</string>
- <string name="description_rstv_17">Program not suitable for children/teens under the age of 17</string>
- <string name="description_rstv_18">Program not suitable for minors under the age of 18</string>
+ <string name="description_rstv_g" translatable="false">Program suitable for all ages</string>
+ <string name="description_rstv_12" translatable="false">Program not suitable for children under the age of 12 </string>
+ <string name="description_rstv_14" translatable="false">Program not suitable for children/teens under the age of 14</string>
+ <string name="description_rstv_15" translatable="false">Program not suitable for children/teens under the age of 15</string>
+ <string name="description_rstv_16" translatable="false">Program not suitable for children/teens under the age of 16</string>
+ <string name="description_rstv_17" translatable="false">Program not suitable for children/teens under the age of 17</string>
+ <string name="description_rstv_18" translatable="false">Program not suitable for minors under the age of 18</string>
<!-- TV content rating system strings for SGF(Free-to-Air) TV -->
<string name="display_name_sgftv" translatable="false">SG-Free-TV</string>
<string name="display_name_sgftv_pg" translatable="false">PG</string>
<string name="display_name_sgftv_pg13" translatable="false">PG13</string>
- <string name="description_sgftv_pg">Suitable for most but parents should guide their young</string>
- <string name="description_sgftv_pg13">Parental Guidance Strongly Cautioned – Suitable for 13 And Above</string>
+ <string name="description_sgftv_pg" translatable="false">Suitable for most but parents should guide their young</string>
+ <string name="description_sgftv_pg13" translatable="false">Parental Guidance Strongly Cautioned - Suitable for 13 And Above</string>
<!-- TV content rating system strings for SGP(Pay TV) TV -->
<string name="display_name_sgptv" translatable="false">SG-Pay-TV</string>
<string name="display_name_sgptv_nc16" translatable="false">NC16</string>
<string name="display_name_sgptv_m18" translatable="false">M18</string>
- <string name="description_sgptv_nc16">No Children Under 16</string>
- <string name="description_sgptv_m18">Nobody under age 18 is admitted</string>
+ <string name="description_sgptv_nc16" translatable="false">No Children Under 16</string>
+ <string name="description_sgptv_m18" translatable="false">Nobody under age 18 is admitted</string>
<!-- TV content rating system strings for SI TV -->
<string name="display_name_sitv" translatable="false">SI-TV</string>
@@ -5404,10 +5408,10 @@
<string name="display_name_sitv_12" translatable="false">+12</string>
<string name="display_name_sitv_15" translatable="false">+15</string>
<string name="display_name_sitv_ad" translatable="false">AD</string>
- <string name="description_sitv_vs">Parental guidance suggested (for children under 6)</string>
- <string name="description_sitv_12">Content suitable for teens over 12 years</string>
- <string name="description_sitv_15">Content suitable for teens over 15 years</string>
- <string name="description_sitv_ad">Content exclusively for adults</string>
+ <string name="description_sitv_vs" translatable="false">Parental guidance suggested (for children under 6)</string>
+ <string name="description_sitv_12" translatable="false">Content suitable for teens over 12 years</string>
+ <string name="description_sitv_15" translatable="false">Content suitable for teens over 15 years</string>
+ <string name="description_sitv_ad" translatable="false">Content exclusively for adults</string>
<!-- TV content rating system strings for TH TV -->
<string name="display_name_thtv" translatable="false">TH-TV</string>
@@ -5417,12 +5421,12 @@
<string name="display_name_thtv_pg13" translatable="false">PG13</string>
<string name="display_name_thtv_pg18" translatable="false">PG18</string>
<string name="display_name_thtv_adults" translatable="false">Adults</string>
- <string name="description_thtv_primary">Content suitable for primary school aged children</string>
- <string name="description_thtv_children">Content suitable for children between 6–12 years old</string>
- <string name="description_thtv_general">Content suitable for general audiences</string>
- <string name="description_thtv_pg13">Content suitable for people aged 13 and above, but can be watched by those who are under the recommended age if parental guidance is provided</string>
- <string name="description_thtv_pg18">Content suitable for people aged above 18 years old; those who are younger that 18 must be provided with parental guidance</string>
- <string name="description_thtv_adults">Content unsuitable for children and youngsters</string>
+ <string name="description_thtv_primary" translatable="false">Content suitable for primary school aged children</string>
+ <string name="description_thtv_children" translatable="false">Content suitable for children between 6-12 years old</string>
+ <string name="description_thtv_general" translatable="false">Content suitable for general audiences</string>
+ <string name="description_thtv_pg13" translatable="false">Content suitable for people aged 13 and above, but can be watched by those who are under the recommended age if parental guidance is provided</string>
+ <string name="description_thtv_pg18" translatable="false">Content suitable for people aged above 18 years old; those who are younger that 18 must be provided with parental guidance</string>
+ <string name="description_thtv_adults" translatable="false">Content unsuitable for children and youngsters</string>
<!-- TV content rating system strings for TR TV -->
<string name="display_name_trtv" translatable="false">TR-TV</string>
@@ -5430,10 +5434,10 @@
<string name="display_name_trtv_7" translatable="false">7+</string>
<string name="display_name_trtv_13" translatable="false">13+</string>
<string name="display_name_trtv_18" translatable="false">18+</string>
- <string name="description_trtv_g">General audience. Suitable for all ages</string>
- <string name="description_trtv_7">Suitable for ages 7 and over</string>
- <string name="description_trtv_13">Suitable for ages 13 and over</string>
- <string name="description_trtv_18">Suitable for ages 13 and over</string>
+ <string name="description_trtv_g" translatable="false">General audience. Suitable for all ages</string>
+ <string name="description_trtv_7" translatable="false">Suitable for ages 7 and over</string>
+ <string name="description_trtv_13" translatable="false">Suitable for ages 13 and over</string>
+ <string name="description_trtv_18" translatable="false">Suitable for ages 13 and over</string>
<!-- TV content rating system strings for TW TV -->
<string name="display_name_twtv" translatable="false">TW-TV</string>
@@ -5441,54 +5445,54 @@
<string name="display_name_twtv_p" translatable="false">Protected category</string>
<string name="display_name_twtv_pg" translatable="false">Parental guidance category</string>
<string name="display_name_twtv_r" translatable="false">Restricted category</string>
- <string name="description_twtv_g">For all ages</string>
- <string name="description_twtv_p">Not suitable for children under 6 years old. People aged 6 but under 12 require guidance from accompanying adults to watch</string>
- <string name="description_twtv_pg">Not suitable for people under 12 years of age. Parental guidance is required for people aged 12 but under 18</string>
- <string name="description_twtv_r">For adults only and people under 18 years of age must not watch</string>
+ <string name="description_twtv_g" translatable="false">For all ages</string>
+ <string name="description_twtv_p" translatable="false">Not suitable for children under 6 years old. People aged 6 but under 12 require guidance from accompanying adults to watch</string>
+ <string name="description_twtv_pg" translatable="false">Not suitable for people under 12 years of age. Parental guidance is required for people aged 12 but under 18</string>
+ <string name="description_twtv_r" translatable="false">For adults only and people under 18 years of age must not watch</string>
<!-- TV content rating system strings for UA TV -->
<string name="display_name_uatv" translatable="false">UA-TV</string>
<string name="display_name_uatv_green circle" translatable="false">Green Circle</string>
<string name="display_name_uatv_yellow triangle" translatable="false">Yellow Triangle</string>
<string name="display_name_uatv_red square" translatable="false">Red Square</string>
- <string name="description_uatv_green circle">This program does not have age restrictions</string>
- <string name="description_uatv_yellow triangle">Children must view this program with parents. In it program there are fragments, which unsuitable for children</string>
- <string name="description_uatv_red square">This program is only for adult viewers. In it there are scenes with nudity, drug use, or violence</string>
+ <string name="description_uatv_green circle" translatable="false">This program does not have age restrictions</string>
+ <string name="description_uatv_yellow triangle" translatable="false">Children must view this program with parents. In it program there are fragments, which unsuitable for children</string>
+ <string name="description_uatv_red square" translatable="false">This program is only for adult viewers. In it there are scenes with nudity, drug use, or violence</string>
<!-- TV content rating system strings for US TV -->
- <string name="display_name_ustvpg" translatable="false">US-TV</string>
- <string name="description_ustvpg">The TV Parental Guidelines</string>
- <string name="display_name_ustvpg_d" translatable="false">D</string>
- <string name="display_name_ustvpg_l" translatable="false">L</string>
- <string name="display_name_ustvpg_s" translatable="false">S</string>
- <string name="display_name_ustvpg_v" translatable="false">V</string>
- <string name="display_name_ustvpg_fv" translatable="false">FV</string>
- <string name="display_name_ustvpg_y" translatable="false">TV-Y</string>
- <string name="display_name_ustvpg_y7" translatable="false">TV-Y7</string>
- <string name="display_name_ustvpg_g" translatable="false">TV-G</string>
- <string name="display_name_ustvpg_pg" translatable="false">TV-PG</string>
- <string name="display_name_ustvpg_14" translatable="false">TV-14</string>
- <string name="display_name_ustvpg_ma" translatable="false">TV-MA</string>
- <string name="description_ustvpg_d">Suggestive dialogue (Usually means talks about sex)</string>
- <string name="description_ustvpg_l">Coarse language</string>
- <string name="description_ustvpg_s">Sexual content</string>
- <string name="description_ustvpg_v">Violence</string>
- <string name="description_ustvpg_fv">Fantasy violence (Children\'s programming only)</string>
- <string name="description_ustvpg_y">This program is designed to be appropriate for all children</string>
- <string name="description_ustvpg_y7">This program is designed for children age 7 and above</string>
- <string name="description_ustvpg_g">Most parents would find this program suitable for all ages</string>
- <string name="description_ustvpg_pg">This program contains material that parents may find unsuitable for younger children</string>
- <string name="description_ustvpg_14">This program contains some material that many parents would find unsuitable for children under 14 years of age</string>
- <string name="description_ustvpg_ma">This program is specifically designed to be viewed by adults and therefore may be unsuitable for children under 17</string>
+ <string name="display_name_ustv" translatable="false">US-TV</string>
+ <string name="description_ustv" translatable="false">TV content rating system for United States</string>
+ <string name="display_name_ustv_d" translatable="false">D</string>
+ <string name="display_name_ustv_l" translatable="false">L</string>
+ <string name="display_name_ustv_s" translatable="false">S</string>
+ <string name="display_name_ustv_v" translatable="false">V</string>
+ <string name="display_name_ustv_fv" translatable="false">FV</string>
+ <string name="display_name_ustv_y" translatable="false">TV-Y</string>
+ <string name="display_name_ustv_y7" translatable="false">TV-Y7</string>
+ <string name="display_name_ustv_g" translatable="false">TV-G</string>
+ <string name="display_name_ustv_pg" translatable="false">TV-PG</string>
+ <string name="display_name_ustv_14" translatable="false">TV-14</string>
+ <string name="display_name_ustv_ma" translatable="false">TV-MA</string>
+ <string name="description_ustv_d" translatable="false">Suggestive dialogue (Usually means talks about sex)\nApplicable to US_TV_PG, US_TV_14, US_TV</string>
+ <string name="description_ustv_l" translatable="false">Coarse language\nApplicable to US_TV_PG, US_TV_14</string>
+ <string name="description_ustv_s" translatable="false">Sexual content\nApplicable to US_TV_PG, US_TV_14, US_TV_MA</string>
+ <string name="description_ustv_v" translatable="false">Violence\nApplicable to US_TV_PG, US_TV_14, US_TV_MA</string>
+ <string name="description_ustv_fv" translatable="false">Fantasy violence (Children\'s programming only)\nApplicable to US_TV_Y7</string>
+ <string name="description_ustv_y" translatable="false">This program is designed to be appropriate for all children</string>
+ <string name="description_ustv_y7" translatable="false">This program is designed for children age 7 and above</string>
+ <string name="description_ustv_g" translatable="false">Most parents would find this program suitable for all ages</string>
+ <string name="description_ustv_pg" translatable="false">This program contains material that parents may find unsuitable for younger children</string>
+ <string name="description_ustv_14" translatable="false">This program contains some material that many parents would find unsuitable for children under 14 years of age</string>
+ <string name="description_ustv_ma" translatable="false">This program is specifically designed to be viewed by adults and therefore may be unsuitable for children under 17</string>
<!-- TV content rating system strings for VE TV -->
<string name="display_name_vetv" translatable="false">VE-TV</string>
<string name="display_name_vetv_tu" translatable="false">TU</string>
<string name="display_name_vetv_su" translatable="false">SU</string>
<string name="display_name_vetv_a" translatable="false">A</string>
- <string name="description_vetv_tu">For all ages</string>
- <string name="description_vetv_su">Parental guidance for young viewers</string>
- <string name="description_vetv_a">Mature viewers</string>
+ <string name="description_vetv_tu" translatable="false">For all ages</string>
+ <string name="description_vetv_su" translatable="false">Parental guidance for young viewers</string>
+ <string name="description_vetv_a" translatable="false">Mature viewers</string>
<!-- TV content rating system strings for ZA TV -->
<string name="display_name_zatv" translatable="false">ZA-TV</string>
@@ -5504,19 +5508,22 @@
<string name="display_name_zatv_16" translatable="false">16</string>
<string name="display_name_zatv_18" translatable="false">18</string>
<string name="display_name_zatv_r18" translatable="false">R18</string>
- <string name="description_zatv_d">Drug</string>
- <string name="description_zatv_v">Violence</string>
- <string name="description_zatv_n">Nudity</string>
- <string name="description_zatv_p">Prejudice</string>
- <string name="description_zatv_s">Sex</string>
- <string name="description_zatv_l">Language</string>
- <string name="description_zatv_f">This is a program/film that does not contain any obscenity, and is suitable for family viewing. A logo must be displayed in the corner of the screen for 30 seconds after each commercial break</string>
- <string name="description_zatv_pg">Children under 6 may watch this program/film, but must be accompanied by an adult. This program contains an adult related theme, which might include very mild language, violence and sexual innuendo. A logo must be displayed in the corner of the screen for one minute after each commercial break</string>
- <string name="description_zatv_13">Children under 13 are prohibited from watching this program/film. This program contains mild language, violence and sexual innuendo. A logo must be displayed in the corner of the screen for two minutes after each commercial break</string>
- <string name="description_zatv_16">Children under 16 are prohibited from watching this program/film. It contains moderate violence, language, and some sexual situations. In the case of television, this program may only be broadcast after 9pm–4:30am. A logo must be displayed in the corner of the screen for five minutes after each commercial break. A full-screen warning must be issued before the start of the program. If the program is longer than an hour, a warning must be displayed every half an hour</string>
- <string name="description_zatv_18">Children under 18 are prohibited from watching this program/film. It contains extreme violence, language and/or graphic sexual content. In the case of television, this program may only be broadcast from 10pm–4:30am. A logo must be displayed in the corner of the screen for the duration of the program. A full-screen warning must be issued before the start of the program and after each commercial break</string>
- <string name="description_zatv_r18">This is reserved for films of an extreme sexual nature (pornography). R18 films may only be distributed in the form of video and DVD in a controlled environment (e.g. Adult Shops). No public viewing of this film may take place. R18 films may not be broadcast on television and in cinemas</string>
+ <string name="description_zatv_d" translatable="false">Drug\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_v" translatable="false">Violence\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_n" translatable="false">Nudity\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_p" translatable="false">Prejudice\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_s" translatable="false">Sex\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_l" translatable="false">Language\nApplicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</string>
+ <string name="description_zatv_f" translatable="false">This is a program/film that does not contain any obscenity, and is suitable for family viewing. A logo must be displayed in the corner of the screen for 30 seconds after each commercial break</string>
+ <string name="description_zatv_pg" translatable="false">Children under 6 may watch this program/film, but must be accompanied by an adult. This program contains an adult related theme, which might include very mild language, violence and sexual innuendo. A logo must be displayed in the corner of the screen for one minute after each commercial break</string>
+ <string name="description_zatv_13" translatable="false">Children under 13 are prohibited from watching this program/film. This program contains mild language, violence and sexual innuendo. A logo must be displayed in the corner of the screen for two minutes after each commercial break</string>
+ <string name="description_zatv_16" translatable="false">Children under 16 are prohibited from watching this program/film. It contains moderate violence, language, and some sexual situations. In the case of television, this program may only be broadcast after 9pm-4:30am. A logo must be displayed in the corner of the screen for five minutes after each commercial break. A full-screen warning must be issued before the start of the program. If the program is longer than an hour, a warning must be displayed every half an hour</string>
+ <string name="description_zatv_18" translatable="false">Children under 18 are prohibited from watching this program/film. It contains extreme violence, language and/or graphic sexual content. In the case of television, this program may only be broadcast from 10pm-4:30am. A logo must be displayed in the corner of the screen for the duration of the program. A full-screen warning must be issued before the start of the program and after each commercial break</string>
+ <string name="description_zatv_r18" translatable="false">This is reserved for films of an extreme sexual nature (pornography). R18 films may only be distributed in the form of video and DVD in a controlled environment (e.g. Adult Shops). No public viewing of this film may take place. R18 films may not be broadcast on television and in cinemas</string>
<!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
<string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging</string>
+
+ <!-- [CHAR_LIMIT=NONE] Zen mode: Condition summary for built-in downtime condition, if active -->
+ <string name="downtime_condition_summary">Until your downtime ends at <xliff:g id="formattedTime" example="10.00 PM">%1$s</xliff:g></string>
</resources>
diff --git a/core/res/res/values/styles_leanback.xml b/core/res/res/values/styles_leanback.xml
index 256ef00..7606c86 100644
--- a/core/res/res/values/styles_leanback.xml
+++ b/core/res/res/values/styles_leanback.xml
@@ -15,8 +15,7 @@
-->
<resources>
<style name="AlertDialog.Leanback" parent="AlertDialog.Material">
- <item name="layout">@android:layout/alert_dialog_leanback</item>
- <item name="buttonPanelSideLayout">@android:layout/alert_dialog_leanback_button_panel_right</item>
+ <item name="buttonPanelSideLayout">@android:layout/alert_dialog_leanback_button_panel_side</item>
</style>
<style name="AlertDialog.Leanback.Light">
@@ -24,7 +23,6 @@
<style name="Widget.Leanback.TimePicker" parent="Widget.Material.TimePicker">
<item name="timePickerMode">spinner</item>
- <item name="legacyLayout">@layout/time_picker_legacy_leanback</item>
</style>
<style name="Widget.Leanback.DatePicker" parent="Widget.Material.DatePicker">
@@ -39,26 +37,36 @@
<style name="TextAppearance.Leanback.FormWizard" parent="@style/TextAppearance.Material">
<item name="textSize">18sp</item>
<item name="fontFamily">sans-serif-light</item>
+ <item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="TextAppearance.Leanback.FormWizard.Small" parent="@style/TextAppearance.Material.Small">
<item name="textSize">18sp</item>
<item name="fontFamily">sans-serif-light</item>
+ <item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="TextAppearance.Leanback.FormWizard.Medium" parent="@style/TextAppearance.Material.Medium">
<item name="textSize">36sp</item>
<item name="fontFamily">sans-serif-thin</item>
+ <item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="TextAppearance.Leanback.FormWizard.Large" parent="@style/TextAppearance.Material.Large">
<item name="textSize">56sp</item>
<item name="fontFamily">sans-serif-thin</item>
+ <item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="TextAppearance.Leanback.FormWizard.ListItem" parent="@style/TextAppearance.Material.Subhead">
- <item name="textSize">18sp</item>
+ <item name="textSize">16sp</item>
<item name="fontFamily">sans-serif-condensed</item>
</style>
+ <style name="WindowAnimationStyle.Leanback.Setup" parent="@style/Animation.Material.Activity">
+ <item name="android:fragmentOpenEnterAnimation">@animator/leanback_setup_fragment_open_enter</item>
+ <item name="android:fragmentOpenExitAnimation">@animator/leanback_setup_fragment_open_exit</item>
+ <item name="android:fragmentCloseEnterAnimation">@animator/leanback_setup_fragment_close_enter</item>
+ <item name="android:fragmentCloseExitAnimation">@animator/leanback_setup_fragment_close_exit</item>
+ </style>
</resources>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 97d4bf6..c8ea699 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -313,15 +313,38 @@
</style>
<style name="TextAppearance.Material.Widget.ActionMode"/>
- <style name="TextAppearance.Material.Widget.ActionMode.Title" parent="TextAppearance.Material.Title" />
- <style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Material.Title.Inverse" />
- <style name="TextAppearance.Material.Widget.ActionMode.Subtitle" parent="TextAppearance.Material.Subhead" />
- <style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Material.Subhead.Inverse" />
-
- <style name="TextAppearance.Material.Widget.ActionBar.Title" parent="TextAppearance.Material.Title" />
- <style name="TextAppearance.Material.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Material.Title.Inverse" />
- <style name="TextAppearance.Material.Widget.ActionBar.Subtitle" parent="TextAppearance.Material.Subhead" />
- <style name="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Material.Subhead.Inverse" />
+ <style name="TextAppearance.Material.Widget.ActionMode.Title"
+ parent="TextAppearance.Material.Title">
+ <item name="textSize">@dimen/text_size_title_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse"
+ parent="TextAppearance.Material.Title.Inverse">
+ <item name="textSize">@dimen/text_size_title_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionMode.Subtitle"
+ parent="TextAppearance.Material.Subhead">
+ <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"
+ parent="TextAppearance.Material.Subhead.Inverse">
+ <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionBar.Title"
+ parent="TextAppearance.Material.Title">
+ <item name="textSize">@dimen/text_size_title_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionBar.Title.Inverse"
+ parent="TextAppearance.Material.Title.Inverse">
+ <item name="textSize">@dimen/text_size_title_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionBar.Subtitle"
+ parent="TextAppearance.Material.Subhead">
+ <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
+ </style>
+ <style name="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse"
+ parent="TextAppearance.Material.Subhead.Inverse">
+ <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
+ </style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu" parent="TextAppearance.Material.Menu">
<item name="textColor">?attr/actionMenuTextColor</item>
@@ -333,6 +356,11 @@
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style>
+ <style name="TextAppearance.Material.Widget.Toolbar.Title"
+ parent="TextAppearance.Material.Widget.ActionBar.Title" />
+ <style name="TextAppearance.Material.Widget.Toolbar.Subtitle"
+ parent="TextAppearance.Material.Widget.ActionBar.Subtitle" />
+
<style name="TextAppearance.Material.WindowTitle" parent="TextAppearance.Material.Title" />
<style name="TextAppearance.Material.DialogWindowTitle" parent="TextAppearance.Material.Title" />
@@ -343,37 +371,37 @@
<style name="TextAppearance.Material.TimePicker.TimeLabel" parent="TextAppearance.Material">
<item name="textSize">@dimen/timepicker_time_label_size</item>
- <item name="textColor">?attr/textColorPrimary</item>
+ <item name="textColor">?attr/textColorSecondaryInverse</item>
</style>
<style name="TextAppearance.Material.TimePicker.AmPmLabel" parent="TextAppearance.Material">
<item name="textSize">@dimen/timepicker_ampm_label_size</item>
<item name="textAllCaps">true</item>
- <item name="textColor">?attr/textColorPrimary</item>
+ <item name="textColor">?attr/textColorSecondaryInverse</item>
<item name="textStyle">bold</item>
</style>
<style name="TextAppearance.Material.DatePicker.DayOfWeekLabel" parent="TextAppearance.Material">
<item name="includeFontPadding">false</item>
- <item name="textColor">?attr/textColorPrimary</item>
+ <item name="textColor">?attr/textColorPrimaryInverse</item>
<item name="textSize">@dimen/datepicker_header_text_size</item>
</style>
<style name="TextAppearance.Material.DatePicker.MonthLabel" parent="TextAppearance.Material">
<item name="includeFontPadding">false</item>
- <item name="textColor">?attr/textColorPrimary</item> <!-- selected should be accent -->
+ <item name="textColor">?attr/textColorSecondaryInverse</item> <!-- selected should be accent -->
<item name="textSize">@dimen/datepicker_selected_date_month_size</item>
</style>
<style name="TextAppearance.Material.DatePicker.DayOfMonthLabel" parent="TextAppearance.Material">
<item name="includeFontPadding">false</item>
- <item name="textColor">?attr/textColorPrimary</item> <!-- selected should be accent -->
+ <item name="textColor">?attr/textColorSecondaryInverse</item> <!-- selected should be accent -->
<item name="textSize">@dimen/datepicker_selected_date_day_size</item>
</style>
<style name="TextAppearance.Material.DatePicker.YearLabel" parent="TextAppearance.Material">
<item name="includeFontPadding">false</item>
- <item name="textColor">?attr/textColorPrimary</item> <!-- selected should be accent -->
+ <item name="textColor">?attr/textColorSecondaryInverse</item> <!-- selected should be accent -->
<item name="textSize">@dimen/datepicker_selected_date_year_size</item>
</style>
@@ -423,13 +451,15 @@
<style name="Widget.Material" parent="Widget" />
<!-- Bordered ink button -->
- <style name="Widget.Material.Button" parent="Widget.Button">
+ <style name="Widget.Material.Button">
<item name="background">@drawable/btn_default_material</item>
<item name="textAppearance">?attr/textAppearanceButton</item>
- <item name="textColor">?attr/textColorPrimary</item>
<item name="minHeight">48dip</item>
<item name="minWidth">88dip</item>
<item name="stateListAnimator">@anim/button_state_list_anim_material</item>
+ <item name="focusable">true</item>
+ <item name="clickable">true</item>
+ <item name="gravity">center_vertical|center_horizontal</item>
</style>
<!-- Small bordered ink button -->
@@ -472,6 +502,7 @@
<style name="Widget.Material.ButtonBar.AlertDialog">
<item name="background">@null</item>
+ <item name="minHeight">@dimen/alert_dialog_button_bar_height</item>
</style>
<style name="Widget.Material.SearchView">
@@ -593,10 +624,10 @@
<item name="internalLayout">@layout/time_picker_holo</item>
<item name="headerTimeTextAppearance">@style/TextAppearance.Material.TimePicker.TimeLabel</item>
<item name="headerAmPmTextAppearance">@style/TextAppearance.Material.TimePicker.AmPmLabel</item>
- <item name="headerSelectedTextColor">?attr/colorControlActivated</item>
- <item name="headerBackgroundColor">@color/transparent</item>
+ <item name="headerSelectedTextColor">?attr/textColorPrimaryInverse</item>
+ <item name="headerBackgroundColor">?attr/colorAccent</item>
<item name="numbersTextColor">?attr/textColorSecondary</item>
- <item name="numbersBackgroundColor">@color/transparent</item>
+ <item name="numbersBackgroundColor">#10ffffff</item>
<item name="amPmTextColor">?attr/textColorSecondary</item>
<item name="amPmBackgroundColor">@color/transparent</item>
<item name="amPmSelectedBackgroundColor">?attr/colorControlActivated</item>
@@ -609,13 +640,13 @@
<!-- Attributes for new-style DatePicker. -->
<item name="internalLayout">@layout/date_picker_holo</item>
<item name="calendarViewShown">true</item>
- <item name="dayOfWeekBackgroundColor">@color/transparent</item>
+ <item name="dayOfWeekBackgroundColor">#10000000</item>
<item name="dayOfWeekTextAppearance">@style/TextAppearance.Material.DatePicker.DayOfWeekLabel</item>
<item name="headerMonthTextAppearance">@style/TextAppearance.Material.DatePicker.MonthLabel</item>
<item name="headerDayOfMonthTextAppearance">@style/TextAppearance.Material.DatePicker.DayOfMonthLabel</item>
<item name="headerYearTextAppearance">@style/TextAppearance.Material.DatePicker.YearLabel</item>
- <item name="headerSelectedTextColor">?attr/colorControlActivated</item>
- <item name="headerBackgroundColor">@color/transparent</item>
+ <item name="headerSelectedTextColor">?attr/textColorPrimaryInverse</item>
+ <item name="headerBackgroundColor">?attr/colorAccent</item>
<item name="yearListItemTextAppearance">@style/TextAppearance.Material.DatePicker.List.YearLabel</item>
<item name="yearListSelectorColor">?attr/colorControlActivated</item>
<item name="calendarTextColor">?attr/textColorSecondary</item>
@@ -633,7 +664,10 @@
<item name="listSelector">?attr/listChoiceBackgroundIndicator</item>
</style>
- <style name="Widget.Material.ListView.DropDown"/>
+ <style name="Widget.Material.ListView.DropDown">
+ <item name="divider">@null</item>
+ </style>
+
<style name="Widget.Material.ListView.White"/>
<style name="Widget.Material.PopupWindow" parent="Widget.PopupWindow"/>
@@ -725,6 +759,10 @@
<item name="overlapAnchor">true</item>
</style>
+ <style name="Widget.Material.Spinner.Form">
+ <item name="background">@drawable/spinner_textfield_background_material</item>
+ </style>
+
<style name="Widget.Material.TabWidget" parent="Widget.TabWidget">
<item name="tabStripLeft">@null</item>
<item name="tabStripRight">@null</item>
@@ -749,6 +787,8 @@
<style name="Widget.Material.Toolbar" parent="Widget.Toolbar">
<item name="navigationButtonStyle">@style/Widget.Material.Toolbar.Button.Navigation</item>
+ <item name="titleTextAppearance">@style/TextAppearance.Material.Widget.Toolbar.Title</item>
+ <item name="subtitleTextAppearance">@style/TextAppearance.Material.Widget.Toolbar.Subtitle</item>
</style>
<style name="Widget.Material.Toolbar.Button.Navigation" parent="Widget.Toolbar.Button.Navigation">
@@ -867,6 +907,10 @@
<style name="Widget.Material.FastScroll" parent="Widget.FastScroll">
<item name="thumbMinWidth">0dp</item>
<item name="thumbMinHeight">0dp</item>
+ <item name="minWidth">88dp</item>
+ <item name="minHeight">88dp</item>
+ <item name="padding">0dp</item>
+ <item name="textSize">45sp</item>
</style>
<style name="Widget.Material.PreferenceFrameLayout">
@@ -936,7 +980,11 @@
</style>
<style name="Widget.Material.Light.NumberPicker" parent="Widget.Material.NumberPicker"/>
- <style name="Widget.Material.Light.TimePicker" parent="Widget.Material.TimePicker" />
+
+ <style name="Widget.Material.Light.TimePicker" parent="Widget.Material.TimePicker">
+ <item name="numbersBackgroundColor">#10000000</item>
+ </style>
+
<style name="Widget.Material.Light.DatePicker" parent="Widget.Material.DatePicker" />
<style name="Widget.Material.Light.ActivityChooserView" parent="Widget.Material.ActivityChooserView" />
<style name="Widget.Material.Light.ImageWell" parent="Widget.Material.ImageWell"/>
@@ -974,6 +1022,7 @@
<style name="Widget.Material.Light.Spinner" parent="Widget.Material.Spinner" />
<style name="Widget.Material.Light.Spinner.DropDown" parent="Widget.Material.Spinner.DropDown"/>
<style name="Widget.Material.Light.Spinner.DropDown.ActionBar" parent="Widget.Material.Spinner.DropDown.ActionBar"/>
+ <style name="Widget.Material.Light.Spinner.Form" parent="Widget.Material.Spinner.Form" />
<style name="Widget.Material.Light.TabWidget" parent="Widget.Material.TabWidget"/>
<style name="Widget.Material.Light.WebTextView" parent="Widget.Material.WebTextView"/>
<style name="Widget.Material.Light.WebView" parent="Widget.Material.WebView"/>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 0ebf0b5..0b3a132 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -349,6 +349,7 @@
<java-symbol type="dimen" name="notification_text_size" />
<java-symbol type="dimen" name="notification_title_text_size" />
<java-symbol type="dimen" name="notification_subtext_size" />
+ <java-symbol type="dimen" name="notification_large_font_vert_pad" />
<java-symbol type="dimen" name="immersive_mode_cling_width" />
<java-symbol type="dimen" name="circular_display_mask_offset" />
@@ -609,9 +610,11 @@
<java-symbol type="string" name="last_month" />
<java-symbol type="string" name="launchBrowserDefault" />
<java-symbol type="string" name="lock_to_app_toast" />
+ <java-symbol type="string" name="lock_to_app_toast_accessible" />
<java-symbol type="string" name="lock_to_app_toast_locked" />
<java-symbol type="string" name="lock_to_app_title" />
<java-symbol type="string" name="lock_to_app_description" />
+ <java-symbol type="string" name="lock_to_app_description_accessible" />
<java-symbol type="string" name="lock_to_app_negative" />
<java-symbol type="string" name="lock_to_app_positive" />
<java-symbol type="layout" name="lock_to_app_checkbox" />
@@ -1699,7 +1702,6 @@
<java-symbol type="layout" name="notification_template_material_base" />
<java-symbol type="layout" name="notification_template_material_big_base" />
<java-symbol type="layout" name="notification_template_material_big_picture" />
- <java-symbol type="layout" name="notification_template_material_big_text" />
<java-symbol type="layout" name="notification_template_material_inbox" />
<java-symbol type="layout" name="notification_template_material_media" />
<java-symbol type="layout" name="notification_template_material_big_media" />
@@ -1721,11 +1723,11 @@
<java-symbol type="anim" name="push_up_out" />
<java-symbol type="anim" name="lock_screen_behind_enter" />
<java-symbol type="anim" name="lock_screen_behind_enter_wallpaper" />
+ <java-symbol type="anim" name="lock_screen_behind_enter_fade_in" />
<java-symbol type="anim" name="lock_screen_wallpaper_exit" />
<java-symbol type="bool" name="config_alwaysUseCdmaRssi" />
<java-symbol type="dimen" name="status_bar_icon_size" />
- <java-symbol type="dimen" name="system_bar_icon_size" />
<java-symbol type="drawable" name="list_selector_pressed_holo_dark" />
<java-symbol type="drawable" name="scrubber_control_disabled_holo" />
<java-symbol type="drawable" name="scrubber_control_selector_holo" />
@@ -1868,8 +1870,6 @@
<java-symbol type="id" name="ampm_label" />
<java-symbol type="id" name="radial_picker" />
<java-symbol type="id" name="separator" />
- <java-symbol type="id" name="layout_buttons" />
- <java-symbol type="id" name="done_button" />
<java-symbol type="id" name="date_picker_header" />
<java-symbol type="id" name="date_picker_month_and_day_layout" />
<java-symbol type="id" name="day_picker_selector_layout" />
@@ -1877,7 +1877,6 @@
<java-symbol type="id" name="date_picker_day" />
<java-symbol type="id" name="date_picker_year" />
<java-symbol type="id" name="animator" />
- <java-symbol type="id" name="done" />
<java-symbol type="string" name="done_label" />
<java-symbol type="string" name="hour_picker_description" />
@@ -1901,6 +1900,7 @@
<java-symbol type="string" name="timepicker_transition_mid_radius_multiplier" />
<java-symbol type="string" name="timepicker_transition_end_radius_multiplier" />
<java-symbol type="string" name="battery_saver_description" />
+ <java-symbol type="string" name="downtime_condition_summary" />
<java-symbol type="string" name="item_is_selected" />
<java-symbol type="string" name="day_of_week_label_typeface" />
@@ -1956,6 +1956,7 @@
<java-symbol type="attr" name="preferenceFragmentStyle" />
<java-symbol type="bool" name="skipHoldBeforeMerge" />
<java-symbol type="bool" name="imsServiceAllowTurnOff" />
+ <java-symbol type="bool" name="config_mobile_allow_volte_vt" />
<java-symbol type="bool" name="useImsAlwaysForEmergencyCall" />
<java-symbol type="attr" name="touchscreenBlocksFocus" />
<java-symbol type="layout" name="resolver_list_with_default" />
@@ -1978,4 +1979,12 @@
<java-symbol type="bool" name="config_sms_decode_gsm_8bit_data" />
<java-symbol type="string" name="time_picker_am_label" />
<java-symbol type="string" name="time_picker_pm_label" />
+ <java-symbol type="dimen" name="text_size_small_material" />
+ <java-symbol type="attr" name="checkMarkGravity" />
+ <java-symbol type="layout" name="select_dialog_singlechoice_material" />
+ <java-symbol type="layout" name="select_dialog_multichoice_material" />
+ <java-symbol type="array" name="no_ems_support_sim_operators" />
+ <java-symbol type="color" name="battery_saver_mode_color" />
+ <java-symbol type="color" name="system_notification_accent_color" />
+ <java-symbol type="dimen" name="text_handle_min_size" />
</resources>
diff --git a/core/res/res/values/themes_leanback.xml b/core/res/res/values/themes_leanback.xml
index 321b827..2b3b8d5 100644
--- a/core/res/res/values/themes_leanback.xml
+++ b/core/res/res/values/themes_leanback.xml
@@ -14,12 +14,33 @@
limitations under the License.
-->
<resources>
+ <style name="Theme.Leanback.Dialog" parent="Theme.Material.BaseDialog">
+ <item name="colorBackground">@color/background_leanback_dark</item>
+ <item name="textColorPrimary">@color/primary_text_leanback_dark</item>
+ <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
+ <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
+ <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
+ <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
+ </style>
+
+ <style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.BaseDialog">
+ <item name="colorBackground">@color/background_leanback_dark</item>
+ <item name="textColorPrimary">@color/primary_text_leanback_dark</item>
+ <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
+ <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
+ <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
+ <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
+ </style>
+
<style name="Theme.Leanback.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert">
<item name="colorBackground">@color/background_leanback_dark</item>
<item name="textColorPrimary">@color/primary_text_leanback_dark</item>
<item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
<item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
<item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
<item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
</style>
@@ -29,22 +50,13 @@
<item name="textColorSecondary">@color/secondary_text_leanback_light</item>
<item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>
<item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
<item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
</style>
- <style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.Dialog">
- </style>
-
- <style name="Theme.Leanback.Dialog" parent="Theme.Material.Dialog">
- </style>
-
<style name="Theme.Leanback.Dialog.AppError" parent="Theme.Leanback.Dialog">
- <item name="windowFrame">@null</item>
- <item name="windowBackground">@color/transparent</item>
- <item name="windowIsFloating">true</item>
- <item name="windowContentOverlay">@null</item>
+ <item name="windowContentTransitions">false</item>
<item name="windowCloseOnTouchOutside">false</item>
- <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
</style>
<!-- Setup and form wizard themes @hide @SystemApi-->
@@ -57,5 +69,7 @@
<item name="textAppearanceLarge">@style/TextAppearance.Leanback.FormWizard.Large</item>
<item name="textAppearanceListItem">@style/TextAppearance.Leanback.FormWizard.ListItem</item>
<item name="textAppearance">@style/TextAppearance.Leanback.FormWizard</item>
+ <item name="textColorPrimary">@color/primary_text_leanback_formwizard_dark</item>
+ <item name="windowAnimationStyle">@style/WindowAnimationStyle.Leanback.Setup</item>
</style>
</resources>
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 1376dfa..18170ac 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -354,20 +354,20 @@
<item name="timePickerStyle">@style/Widget.Material.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/alertDialogTheme</item>
+ <item name="timePickerDialogTheme">?attr/dialogTheme</item>
<!-- DatePicker style -->
- <item name="datePickerStyle">?attr/alertDialogTheme</item>
+ <item name="datePickerStyle">?attr/dialogTheme</item>
<!-- DatePicker dialog theme -->
<item name="datePickerDialogTheme">@style/Theme.Material.Dialog.Alert</item>
<!-- TODO: This belongs in a FastScroll style -->
<item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_material</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item>
+ <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_material</item>
+ <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_material</item>
<item name="fastScrollTrackDrawable">@drawable/fastscroll_track_material</item>
- <item name="fastScrollOverlayPosition">atThumb</item>
+ <item name="fastScrollOverlayPosition">aboveThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/material_blue_grey_900</item>
@@ -697,19 +697,19 @@
<item name="timePickerStyle">@style/Widget.Material.Light.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/alertDialogTheme</item>
+ <item name="timePickerDialogTheme">?attr/dialogTheme</item>
<!-- DatePicker style -->
<item name="datePickerStyle">@style/Widget.Material.Light.DatePicker</item>
<!-- DatePicker dialog theme -->
- <item name="datePickerDialogTheme">?attr/alertDialogTheme</item>
+ <item name="datePickerDialogTheme">?attr/dialogTheme</item>
<item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_material</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item>
+ <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_material</item>
+ <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_material</item>
<item name="fastScrollTrackDrawable">@drawable/fastscroll_track_material</item>
- <item name="fastScrollOverlayPosition">atThumb</item>
+ <item name="fastScrollOverlayPosition">aboveThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/material_blue_grey_100</item>
@@ -985,12 +985,7 @@
<!-- Dialog themes for Material -->
<eat-comment />
- <!-- Material theme for dialog windows and activities, which is used by the
- {@link android.app.Dialog} class. This changes the window to be
- floating (not fill the entire screen), and puts a frame around its
- contents. You can set this theme on an activity if you would like to
- make an activity that looks like a Dialog. -->
- <style name="Theme.Material.Dialog">
+ <style name="Theme.Material.BaseDialog">
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
@@ -1019,6 +1014,13 @@
<item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
</style>
+ <!-- Material theme for dialog windows and activities, which is used by the
+ {@link android.app.Dialog} class. This changes the window to be
+ floating (not fill the entire screen), and puts a frame around its
+ contents. You can set this theme on an activity if you would like to
+ make an activity that looks like a Dialog. -->
+ <style name="Theme.Material.Dialog" parent="Theme.Material.BaseDialog"/>
+
<!-- Variant of Theme.Material.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.Dialog.MinWidth">
@@ -1095,12 +1097,7 @@
<!-- Light material dialog themes -->
- <!-- Material light theme for dialog windows and activities, which is used by the
- {@link android.app.Dialog} class. This changes the window to be
- floating (not fill the entire screen), and puts a frame around its
- contents. You can set this theme on an activity if you would like to
- make an activity that looks like a Dialog. -->
- <style name="Theme.Material.Light.Dialog">
+ <style name="Theme.Material.Light.BaseDialog">
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
@@ -1129,6 +1126,13 @@
<item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
</style>
+ <!-- Material light theme for dialog windows and activities, which is used by the
+ {@link android.app.Dialog} class. This changes the window to be
+ floating (not fill the entire screen), and puts a frame around its
+ contents. You can set this theme on an activity if you would like to
+ make an activity that looks like a Dialog. -->
+ <style name="Theme.Material.Light.Dialog" parent="Theme.Material.Light.BaseDialog"/>
+
<!-- Variant of Theme.Material.Light.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.Light.Dialog.MinWidth">
@@ -1187,19 +1191,6 @@
AlertDialog theme. -->
<style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.BaseAlert"/>
- <!-- Base theme used to prevent circular references in Leanback overrides. -->
- <style name="Theme.Material.Light.Dialog.BaseTimePicker" />
-
- <!-- Material Light theme for the TimePicker dialog windows, which is used by the
- {@link android.app.TimePickerDialog} class. -->
- <style name="Theme.Material.Light.Dialog.TimePicker" parent="Theme.Material.Light.Dialog.BaseTimePicker" />
-
- <style name="Theme.Material.Light.Dialog.BaseDatePicker" />
-
- <!-- Material Light theme for the DatePicker dialog windows, which is used by the
- {@link android.app.DatePickerDialog} class. -->
- <style name="Theme.Material.Light.Dialog.DatePicker" parent="Theme.Material.Light.Dialog.BaseDatePicker"/>
-
<!-- Theme for a presentation window on a secondary display. -->
<style name="Theme.Material.Light.Dialog.Presentation" parent="@style/Theme.Material.Light.NoActionBar.Fullscreen" />
diff --git a/core/res/res/xml/tv_content_rating_systems.xml b/core/res/res/xml/tv_content_rating_systems.xml
index 8e2a23c..1318274 100644
--- a/core/res/res/xml/tv_content_rating_systems.xml
+++ b/core/res/res/xml/tv_content_rating_systems.xml
@@ -1549,75 +1549,75 @@
</rating-system-definition>
<!-- TV content rating system for US TV -->
- <rating-system-definition id="US_TVPG"
- displayName="@string/display_name_ustvpg"
- description="@string/description_ustvpg"
+ <rating-system-definition id="US_TV"
+ displayName="@string/display_name_ustv"
+ description="@string/description_ustv"
country="US">
- <sub-rating-definition id="US_TVPG_D"
- displayName="@string/display_name_ustvpg_d"
- description="@string/description_ustvpg_d" />
- <sub-rating-definition id="US_TVPG_L"
- displayName="@string/display_name_ustvpg_l"
- description="@string/description_ustvpg_l" />
- <sub-rating-definition id="US_TVPG_S"
- displayName="@string/display_name_ustvpg_s"
- description="@string/description_ustvpg_s" />
- <sub-rating-definition id="US_TVPG_V"
- displayName="@string/display_name_ustvpg_v"
- description="@string/description_ustvpg_v" />
- <sub-rating-definition id="US_TVPG_FV"
- displayName="@string/display_name_ustvpg_fv"
- description="@string/description_ustvpg_fv" />
+ <sub-rating-definition id="US_TV_D"
+ displayName="@string/display_name_ustv_d"
+ description="@string/description_ustv_d" />
+ <sub-rating-definition id="US_TV_L"
+ displayName="@string/display_name_ustv_l"
+ description="@string/description_ustv_l" />
+ <sub-rating-definition id="US_TV_S"
+ displayName="@string/display_name_ustv_s"
+ description="@string/description_ustv_s" />
+ <sub-rating-definition id="US_TV_V"
+ displayName="@string/display_name_ustv_v"
+ description="@string/description_ustv_v" />
+ <sub-rating-definition id="US_TV_FV"
+ displayName="@string/display_name_ustv_fv"
+ description="@string/description_ustv_fv" />
- <rating-definition id="US_TVPG_TV_Y"
- displayName="@string/display_name_ustvpg_y"
- description="@string/description_ustvpg_y"
+ <rating-definition id="US_TV_Y"
+ displayName="@string/display_name_ustv_y"
+ description="@string/description_ustv_y"
ageHint="0" />
- <rating-definition id="US_TVPG_TV_Y7"
- displayName="@string/display_name_ustvpg_y7"
- description="@string/description_ustvpg_y7"
+ <rating-definition id="US_TV_Y7"
+ displayName="@string/display_name_ustv_y7"
+ description="@string/description_ustv_y7"
ageHint="7">
- <sub-rating id="US_TVPG_FV" />
+ <sub-rating id="US_TV_FV" />
</rating-definition>
- <rating-definition id="US_TVPG_TV_G"
- displayName="@string/display_name_ustvpg_g"
- description="@string/description_ustvpg_g"
+ <rating-definition id="US_TV_G"
+ displayName="@string/display_name_ustv_g"
+ description="@string/description_ustv_g"
ageHint="0" />
- <rating-definition id="US_TVPG_TV_PG"
- displayName="@string/display_name_ustvpg_pg"
- description="@string/description_ustvpg_pg"
+ <rating-definition id="US_TV_PG"
+ displayName="@string/display_name_ustv_pg"
+ description="@string/description_ustv_pg"
ageHint="14">
- <sub-rating id="US_TVPG_D" />
- <sub-rating id="US_TVPG_L" />
- <sub-rating id="US_TVPG_S" />
- <sub-rating id="US_TVPG_V" />
+ <sub-rating id="US_TV_D" />
+ <sub-rating id="US_TV_L" />
+ <sub-rating id="US_TV_S" />
+ <sub-rating id="US_TV_V" />
</rating-definition>
- <rating-definition id="US_TVPG_TV_14"
- displayName="@string/display_name_ustvpg_14"
- description="@string/description_ustvpg_14"
+ <rating-definition id="US_TV_14"
+ displayName="@string/display_name_ustv_14"
+ description="@string/description_ustv_14"
ageHint="14">
- <sub-rating id="US_TVPG_D" />
- <sub-rating id="US_TVPG_L" />
- <sub-rating id="US_TVPG_S" />
- <sub-rating id="US_TVPG_V" />
+ <sub-rating id="US_TV_D" />
+ <sub-rating id="US_TV_L" />
+ <sub-rating id="US_TV_S" />
+ <sub-rating id="US_TV_V" />
</rating-definition>
- <rating-definition id="US_TVPG_TV_MA"
- displayName="@string/display_name_ustvpg_ma"
- description="@string/description_ustvpg_ma"
+ <rating-definition id="US_TV_MA"
+ displayName="@string/display_name_ustv_ma"
+ description="@string/description_ustv_ma"
ageHint="17">
- <sub-rating id="US_TVPG_L" />
- <sub-rating id="US_TVPG_S" />
- <sub-rating id="US_TVPG_V" />
+ <sub-rating id="US_TV_L" />
+ <sub-rating id="US_TV_S" />
+ <sub-rating id="US_TV_V" />
</rating-definition>
<order>
- <rating id="US_TVPG_TV_Y" />
- <rating id="US_TVPG_TV_Y7" />
+ <rating id="US_TV_Y" />
+ <rating id="US_TV_Y7" />
</order>
<order>
- <rating id="US_TVPG_TV_G" />
- <rating id="US_TVPG_TV_PG" />
- <rating id="US_TVPG_TV_14" />
- <rating id="US_TVPG_TV_MA" />
+ <rating id="US_TV_G" />
+ <rating id="US_TV_PG" />
+ <rating id="US_TV_14" />
+ <rating id="US_TV_MA" />
</order>
</rating-system-definition>
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
index 116a31e..93b16e7 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
@@ -26,8 +26,8 @@
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress;
-import android.net.LinkProperties;
import android.net.RouteInfo;
+import android.net.StaticIpConfiguration;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiConfiguration.KeyMgmt;
@@ -116,7 +116,7 @@
boolean usercert = false;
WifiConfiguration config = null;
int securityType = NONE;
- LinkProperties mLinkProperties = null;
+ StaticIpConfiguration mStaticIpConfiguration = null;
InetAddress mInetAddr = null;
@Override
@@ -153,7 +153,7 @@
usercert = true;
}
if (tagName.equalsIgnoreCase("ip")) {
- mLinkProperties = new LinkProperties();
+ mStaticIpConfiguration = new StaticIpConfiguration();
ip = true;
}
if (tagName.equalsIgnoreCase("gateway")) {
@@ -173,15 +173,15 @@
@Override
public void endElement(String uri, String localName, String tagName) throws SAXException {
if (tagName.equalsIgnoreCase("accesspoint")) {
- if (mLinkProperties != null) {
+ if (mStaticIpConfiguration != null) {
config.setIpAssignment(IpAssignment.STATIC);
- config.setLinkProperties(mLinkProperties);
+ config.setStaticIpConfiguration(mStaticIpConfiguration);
} else {
config.setIpAssignment(IpAssignment.DHCP);
}
config.setProxySettings(ProxySettings.NONE);
networks.add(config);
- mLinkProperties = null;
+ mStaticIpConfiguration = null;
}
}
@@ -312,7 +312,7 @@
if (!InetAddress.isNumeric(gwAddr)) {
throw new SAXException();
}
- mLinkProperties.addRoute(new RouteInfo(InetAddress.getByName(gwAddr)));
+ mStaticIpConfiguration.gateway = InetAddress.getByName(gwAddr);
} catch (UnknownHostException e) {
throw new SAXException();
}
@@ -324,7 +324,7 @@
if ((nwPrefixLength < 0) || (nwPrefixLength > 32)) {
throw new SAXException();
}
- mLinkProperties.addLinkAddress(new LinkAddress(mInetAddr, nwPrefixLength));
+ mStaticIpConfiguration.ipAddress = new LinkAddress(mInetAddr, nwPrefixLength);
} catch (NumberFormatException e) {
throw new SAXException();
}
@@ -336,7 +336,7 @@
if (!InetAddress.isNumeric(dnsAddr)) {
throw new SAXException();
}
- mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr));
+ mStaticIpConfiguration.dnsServers.add(InetAddress.getByName(dnsAddr));
} catch (UnknownHostException e) {
throw new SAXException();
}
@@ -348,7 +348,7 @@
if (!InetAddress.isNumeric(dnsAddr)) {
throw new SAXException();
}
- mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr));
+ mStaticIpConfiguration.dnsServers.add(InetAddress.getByName(dnsAddr));
} catch (UnknownHostException e) {
throw new SAXException();
}
diff --git a/core/tests/coretests/src/android/net/RouteInfoTest.java b/core/tests/coretests/src/android/net/RouteInfoTest.java
index dcacd11..0b88bc7 100644
--- a/core/tests/coretests/src/android/net/RouteInfoTest.java
+++ b/core/tests/coretests/src/android/net/RouteInfoTest.java
@@ -214,6 +214,29 @@
assertFalse(r.isIPv6Default());
}
+ public void testTruncation() {
+ LinkAddress l;
+ RouteInfo r;
+
+ l = new LinkAddress("192.0.2.5/30");
+ r = new RouteInfo(l, Address("192.0.2.1"), "wlan0");
+ assertEquals("192.0.2.4", r.getDestination().getAddress().getHostAddress());
+
+ l = new LinkAddress("2001:db8:1:f::5/63");
+ r = new RouteInfo(l, Address("2001:db8:5::1"), "wlan0");
+ assertEquals("2001:db8:1:e::", r.getDestination().getAddress().getHostAddress());
+ }
+
+ // Make sure that creating routes to multicast addresses doesn't throw an exception. Even though
+ // there's nothing we can do with them, we don't want to crash if, e.g., someone calls
+ // requestRouteToHostAddress("230.0.0.0", MOBILE_HIPRI);
+ public void testMulticastRoute() {
+ RouteInfo r;
+ r = new RouteInfo(Prefix("230.0.0.0/32"), Address("192.0.2.1"), "wlan0");
+ r = new RouteInfo(Prefix("ff02::1/128"), Address("2001:db8::1"), "wlan0");
+ // No exceptions? Good.
+ }
+
public RouteInfo passThroughParcel(RouteInfo r) {
Parcel p = Parcel.obtain();
RouteInfo r2 = null;
diff --git a/data/fonts/AndroidClock.ttf b/data/fonts/AndroidClock.ttf
index 4781ccd..a955442 100644
--- a/data/fonts/AndroidClock.ttf
+++ b/data/fonts/AndroidClock.ttf
Binary files differ
diff --git a/data/fonts/AndroidClock_Highlight.ttf b/data/fonts/AndroidClock_Highlight.ttf
index 3fa6d88..923bb30 100644
--- a/data/fonts/AndroidClock_Highlight.ttf
+++ b/data/fonts/AndroidClock_Highlight.ttf
Binary files differ
diff --git a/data/fonts/AndroidClock_Solid.ttf b/data/fonts/AndroidClock_Solid.ttf
index 3fa6d88..923bb30 100644
--- a/data/fonts/AndroidClock_Solid.ttf
+++ b/data/fonts/AndroidClock_Solid.ttf
Binary files differ
diff --git a/data/fonts/Clockopia.ttf b/data/fonts/Clockopia.ttf
index 123ea4f..3f7b6aa 100644
--- a/data/fonts/Clockopia.ttf
+++ b/data/fonts/Clockopia.ttf
Binary files differ
diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf
index 03f49a8..96b16bb 100644
--- a/data/fonts/DroidSansFallback.ttf
+++ b/data/fonts/DroidSansFallback.ttf
Binary files differ
diff --git a/data/fonts/DroidSansFallbackFull.ttf b/data/fonts/DroidSansFallbackFull.ttf
index 1dfcc33..89959f5 100644
--- a/data/fonts/DroidSansFallbackFull.ttf
+++ b/data/fonts/DroidSansFallbackFull.ttf
Binary files differ
diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf
index a007071..4085cee 100644
--- a/data/fonts/DroidSansMono.ttf
+++ b/data/fonts/DroidSansMono.ttf
Binary files differ
diff --git a/data/fonts/MTLc3m.ttf b/data/fonts/MTLc3m.ttf
index 86bdcc7..e9018f6 100644
--- a/data/fonts/MTLc3m.ttf
+++ b/data/fonts/MTLc3m.ttf
Binary files differ
diff --git a/data/fonts/MTLmr3m.ttf b/data/fonts/MTLmr3m.ttf
index 91dd47f..14f27d4 100644
--- a/data/fonts/MTLmr3m.ttf
+++ b/data/fonts/MTLmr3m.ttf
Binary files differ
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index ed9bea5..f6d8ee9 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -226,6 +226,7 @@
$(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk
index ae4bc88..879e57a 100644
--- a/data/sounds/AudioPackage10.mk
+++ b/data/sounds/AudioPackage10.mk
@@ -30,6 +30,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \
diff --git a/data/sounds/AudioPackage11.mk b/data/sounds/AudioPackage11.mk
index 3c09297..03e205b 100644
--- a/data/sounds/AudioPackage11.mk
+++ b/data/sounds/AudioPackage11.mk
@@ -30,6 +30,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock_48k.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock_48k.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \
diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk
index af89a82..c37c392 100644
--- a/data/sounds/AudioPackage12.mk
+++ b/data/sounds/AudioPackage12.mk
@@ -12,7 +12,8 @@
NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
- VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted
+ VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted \
+ Trusted
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
$(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)
diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk
index 636bb9f..2a5efb0 100644
--- a/data/sounds/AudioPackage12_48.mk
+++ b/data/sounds/AudioPackage12_48.mk
@@ -12,7 +12,7 @@
NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
- VideoRecord camera_click Lock Unlock
+ VideoRecord camera_click Lock Unlock Trusted
# Alarms not yet available in 48 kHz
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
@@ -33,4 +33,4 @@
$(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \
- $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg
+ $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg
\ No newline at end of file
diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk
index ea07acd..ba9d7e2 100644
--- a/data/sounds/AudioPackage2.mk
+++ b/data/sounds/AudioPackage2.mk
@@ -40,6 +40,7 @@
$(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \
$(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \
$(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \
diff --git a/data/sounds/AudioPackage3.mk b/data/sounds/AudioPackage3.mk
index a8a3b76..5bfeb42 100644
--- a/data/sounds/AudioPackage3.mk
+++ b/data/sounds/AudioPackage3.mk
@@ -40,6 +40,7 @@
$(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \
$(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \
$(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \
diff --git a/data/sounds/AudioPackage4.mk b/data/sounds/AudioPackage4.mk
index bde3ba0..43dbe20 100644
--- a/data/sounds/AudioPackage4.mk
+++ b/data/sounds/AudioPackage4.mk
@@ -45,6 +45,7 @@
$(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \
$(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \
$(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \
diff --git a/data/sounds/AudioPackage5.mk b/data/sounds/AudioPackage5.mk
index 077335b..fbbb16a 100644
--- a/data/sounds/AudioPackage5.mk
+++ b/data/sounds/AudioPackage5.mk
@@ -27,6 +27,7 @@
$(LOCAL_PATH)/effects/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/Aldebaran.ogg:system/media/audio/notifications/Aldebaran.ogg \
$(LOCAL_PATH)/notifications/Altair.ogg:system/media/audio/notifications/Altair.ogg \
$(LOCAL_PATH)/notifications/Antares.ogg:system/media/audio/notifications/Antares.ogg \
diff --git a/data/sounds/AudioPackage6.mk b/data/sounds/AudioPackage6.mk
index 2cdd702..3205c0e 100644
--- a/data/sounds/AudioPackage6.mk
+++ b/data/sounds/AudioPackage6.mk
@@ -26,6 +26,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/ogg/Antimony.ogg:system/media/audio/notifications/Antimony.ogg \
$(LOCAL_PATH)/notifications/ogg/Argon.ogg:system/media/audio/notifications/Argon.ogg \
$(LOCAL_PATH)/notifications/ogg/Beryllium.ogg:system/media/audio/notifications/Beryllium.ogg \
diff --git a/data/sounds/AudioPackage7.mk b/data/sounds/AudioPackage7.mk
index e909235..c92c1d0 100644
--- a/data/sounds/AudioPackage7.mk
+++ b/data/sounds/AudioPackage7.mk
@@ -28,6 +28,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \
$(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \
diff --git a/data/sounds/AudioPackage7alt.mk b/data/sounds/AudioPackage7alt.mk
index 1132fa9..9c35a2e 100644
--- a/data/sounds/AudioPackage7alt.mk
+++ b/data/sounds/AudioPackage7alt.mk
@@ -27,6 +27,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \
$(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \
diff --git a/data/sounds/AudioPackage8.mk b/data/sounds/AudioPackage8.mk
index 0f4b8ad..b8be4e3e 100644
--- a/data/sounds/AudioPackage8.mk
+++ b/data/sounds/AudioPackage8.mk
@@ -30,6 +30,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \
$(LOCAL_PATH)/notifications/ogg/Bellatrix.ogg:system/media/audio/notifications/Bellatrix.ogg \
diff --git a/data/sounds/AudioPackage9.mk b/data/sounds/AudioPackage9.mk
index 36dc921..9b761bc 100644
--- a/data/sounds/AudioPackage9.mk
+++ b/data/sounds/AudioPackage9.mk
@@ -30,6 +30,7 @@
$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
+ $(LOCAL_PATH)/effects/ogg/Trusted.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
$(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \
$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \
diff --git a/data/sounds/effects/ogg/Trusted.ogg b/data/sounds/effects/ogg/Trusted.ogg
new file mode 100644
index 0000000..d7f65ee
--- /dev/null
+++ b/data/sounds/effects/ogg/Trusted.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/Trusted_48k.ogg b/data/sounds/effects/ogg/Trusted_48k.ogg
new file mode 100644
index 0000000..2b63c39
--- /dev/null
+++ b/data/sounds/effects/ogg/Trusted_48k.ogg
Binary files differ
diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd
index 90d8d4c..1c7c802 100644
--- a/docs/html/google/gcm/ccs.jd
+++ b/docs/html/google/gcm/ccs.jd
@@ -40,8 +40,6 @@
<li><a href="{@docRoot}google/gcm/gs.html">Getting Started</a></li>
<li><a href="{@docRoot}google/gcm/server.html">Implementing GCM Server</a></li>
<li><a href="{@docRoot}google/gcm/client.html">Implementing GCM Client</a></li>
-<li><a href="https://services.google.com/fb/forms/gcm/" class="external-link"
-target="_android">CCS and User Notifications Signup Form</a></li>
</ol>
</div>
diff --git a/docs/html/google/gcm/gs.jd b/docs/html/google/gcm/gs.jd
index 4cfe1bc..ae57b6d 100644
--- a/docs/html/google/gcm/gs.jd
+++ b/docs/html/google/gcm/gs.jd
@@ -20,7 +20,6 @@
<ol class="toc">
<li><a href="https://cloud.google.com/console">Google Cloud Console</a></li>
<li><a href="https://developers.google.com/console/help/new/">Google Cloud Console Help</a></li>
-<li><a href="https://services.google.com/fb/forms/gcm/" class="external-link" target="_android">CCS and User Notifications Signup Form</a></li>
</ol>
</div>
diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd
index e168d70..4f5e65c 100644
--- a/docs/html/google/play/billing/billing_reference.jd
+++ b/docs/html/google/play/billing/billing_reference.jd
@@ -102,15 +102,28 @@
</tr>
<tr>
<td>{@code type}</td>
- <td>Value must be “inapp” for an in-app product or "subs" for
+ <td>Value must be “inapp” for an in-app product or "subs" for
subscriptions.</td>
</tr>
<tr>
<td>{@code price}</td>
- <td>Formatted price of the item, including its currency sign. The price
+ <td>Formatted price of the item, including its currency sign. The price
does not include tax.</td>
</tr>
<tr>
+ <td>{@code price_amount_micros}</td>
+ <td>Price in micro-units, where 1,000,000 micro-units equal one unit of the
+ currency. For example, if {@code price} is {@code "€7.99"}, {@code
+ price_amount_micros} is {@code "7990000"}.</td>
+ </tr>
+ <tr>
+ <td>{@code price_currency_code}</td>
+ <td><a href="http://en.wikipedia.org/wiki/ISO_4217#Active_codes">ISO 4217
+ currency code</a> for {@code price}. For example, if {@code price} is
+ specified in British pounds sterling, {@code price_currency_code} is {@code
+ "GBP"}.</td>
+ </tr>
+ <tr>
<td>{@code title}</td>
<td>Title of the product.</td>
</tr>
diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd
index b4813a5..3b52b0a 100644
--- a/docs/html/guide/components/intents-common.jd
+++ b/docs/html/guide/components/intents-common.jd
@@ -1316,7 +1316,7 @@
<dt>{@link android.provider.MediaStore#EXTRA_MEDIA_FOCUS MediaStore.EXTRA_MEDIA_FOCUS} (required)</dt>
<dd>
<p>Indicates the search mode (whether the user is looking for a particular artist, album, song,
-playlist, or radio channel). Most search modes take additional extras. For example, if the user
+or playlist). Most search modes take additional extras. For example, if the user
is interested in listening to a particular song, the intent might have three additional extras:
the song title, the artist, and the album. This intent supports the following search modes for
each value of {@link android.provider.MediaStore#EXTRA_MEDIA_FOCUS}:</p>
@@ -1399,24 +1399,6 @@
intent as an unstructured search.</li>
</ul>
</dd>
-<dt><p><em>Radio channel</em> - <code>"vnd.android.cursor.item/radio"</code></p></dt>
-<dd>
-<p>Play a particular radio channel or a radio channel that matches some criteria specified
-by additional extras.</p>
-<p>Additional extras:</p>
-<ul>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_ALBUM} - The album.</li>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_ARTIST} - The artist.</li>
- <li><code>"android.intent.extra.genre"</code> - The genre.</li>
- <li><code>"android.intent.extra.radio_channel"</code> - The radio channel.</li>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_TITLE} - The song name that the radio
- channel is based on.</li>
- <li>{@link android.app.SearchManager#QUERY} (required) - A string that contains any combination
- of: the album, the artist, the genre, the radio channel, or the title. This extra is
- always provided for backward compatibility: existing apps that do not know about search
- modes can process this intent as an unstructured search.</li>
-</ul>
-</dd>
<dt><p><em>Playlist</em> - {@link android.provider.MediaStore.Audio.Playlists#ENTRY_CONTENT_TYPE Audio.Playlists.ENTRY_CONTENT_TYPE}</p></dt>
<dd>
<p>Play a particular playlist or a playlist that matches some criteria specified
@@ -1444,13 +1426,13 @@
<p><b>Example intent:</b></p>
-<p>If the user wants to listen to a radio station that plays songs from a particular artist,
-a search app may generate the following intent:</p>
+<p>If the user wants to listen to music from a particular artist, a search app may generate the
+following intent:</p>
<pre>
-public void playSearchRadioByArtist(String artist) {
+public void playSearchArtist(String artist) {
Intent intent = new Intent(MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH);
intent.putExtra(MediaStore.EXTRA_MEDIA_FOCUS,
- "vnd.android.cursor.item/radio");
+ MediaStore.Audio.Artists.ENTRY_CONTENT_TYPE);
intent.putExtra(MediaStore.EXTRA_MEDIA_ARTIST, artist);
intent.putExtra(SearchManager.QUERY, artist);
if (intent.resolveActivity(getPackageManager()) != null) {
@@ -1488,7 +1470,6 @@
String artist = intent.getStringExtra(MediaStore.EXTRA_MEDIA_ARTIST);
String genre = intent.getStringExtra("android.intent.extra.genre");
String playlist = intent.getStringExtra("android.intent.extra.playlist");
- String rchannel = intent.getStringExtra("android.intent.extra.radio_channel");
String title = intent.getStringExtra(MediaStore.EXTRA_MEDIA_TITLE);
// Determine the search mode and use the corresponding extras
@@ -1521,10 +1502,6 @@
// 'Song' search mode
playSong(album, artist, genre, title);
- } else if (mediaFocus.compareTo("vnd.android.cursor.item/radio") == 0) {
- // 'Radio channel' search mode
- playRadioChannel(album, artist, genre, rchannel, title);
-
} else if (mediaFocus.compareTo(MediaStore.Audio.Playlists.ENTRY_CONTENT_TYPE) == 0) {
// 'Playlist' search mode
playPlaylist(album, artist, genre, playlist, title);
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index e7f93bc..71d6c1c 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -251,36 +251,36 @@
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-windows.exe">
- android-studio-bundle-135.1245622-windows.exe
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-windows.exe">
+ android-studio-bundle-135.1339820-windows.exe
</a>
</td>
- <td>380000036 bytes</td>
- <td>5720baef7d492f2df7398a38dae2fa92</td>
+ <td>379497130 bytes</td>
+ <td>024e002b8c8fa7dcd2ff69fd69e06e56</td>
</tr>
<tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-mac.dmg">
- android-studio-bundle-135.1245622-mac.dmg
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-mac.dmg">
+ android-studio-bundle-135.1339820-mac.dmg
</a>
</td>
- <td>368451923 bytes</td>
- <td>fa9da3625db44687576c5c4e8f96280e</td>
+ <td>368507143 bytes</td>
+ <td>4143f2aa556634eae91701965d88899b</td>
</tr>
<tr>
<td>Linux</td>
<td>
<a onclick="return onDownload(this)" id="linux-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-linux.tgz">
- android-studio-bundle-135.1245622-linux.tgz
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-linux.tgz">
+ android-studio-bundle-135.1339820-linux.tgz
</a>
</td>
- <td>417756987 bytes</td>
- <td>c70dd2e4035484b84f0ad0046a34f136</td>
+ <td>417631443 bytes</td>
+ <td>fa403762ecd0a5da87acbeff485f81cc</td>
</tr>
</table>
@@ -450,6 +450,17 @@
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>Android Studio v0.8.6</a> <em>(August 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <p>See <a href="http://tools.android.com/recent">tools.android.com</a> for a full list of changes.</p>
+ </div>
+</div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Android Studio v0.8.0</a> <em>(June 2014)</em>
</p>
@@ -636,7 +647,7 @@
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
- $('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.0</span>"
+ $('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.6</span>"
+ "<br/> <span class='small'>with the Android SDK for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
diff --git a/docs/html/training/volley/index.jd b/docs/html/training/volley/index.jd
index ba5b09f..97bddae 100644
--- a/docs/html/training/volley/index.jd
+++ b/docs/html/training/volley/index.jd
@@ -20,21 +20,6 @@
<li>Android 1.6 (API Level 4) or higher</li>
</ul>
-<h2>You should also see</h2>
-<ul>
- <li>For a production quality app that uses Volley, see the 2013 Google I/O
- <a href="https://github.com/google/iosched">schedule app</a>. In particular, see:
- <ul>
- <li><a
- href="https://github.com/google/iosched/blob/master/android/src/main/java/com/google/android/apps/iosched/util/ImageLoader.java">
- ImageLoader</a></li>
- <li><a
- href="https://github.com/google/iosched/blob/master/android/src/main/java/com/google/android/apps/iosched/util/BitmapCache.java">
- BitmapCache</a></li>
- </ul>
- </li>
-</ul>
-
</div>
</div>
diff --git a/graphics/java/android/graphics/Outline.java b/graphics/java/android/graphics/Outline.java
index 3177023..4bf0b71 100644
--- a/graphics/java/android/graphics/Outline.java
+++ b/graphics/java/android/graphics/Outline.java
@@ -18,15 +18,15 @@
import android.annotation.NonNull;
import android.graphics.drawable.Drawable;
-import android.view.View;
/**
* Defines a simple shape, used for bounding graphical regions.
* <p>
- * Can be used with a View, or computed by a Drawable, to drive the shape of shadows cast by a
- * View, or to clip the contents of the View.
+ * Can be computed for a View, or computed by a Drawable, to drive the shape of
+ * shadows cast by a View, or to clip the contents of the View.
*
- * @see View#setOutline(Outline)
+ * @see android.view.ViewOutlineProvider
+ * @see android.view.View#setOutlineProvider(android.view.ViewOutlineProvider)
* @see Drawable#getOutline(Outline)
*/
public final class Outline {
@@ -79,21 +79,27 @@
/**
* Returns whether the outline can be used to clip a View.
+ * <p>
+ * Currently, only Outlines that can be represented as a rectangle, circle,
+ * or round rect support clipping.
*
- * Currently, only outlines that can be represented as a rectangle, circle, or round rect
- * support clipping.
- *
- * @see {@link View#setClipToOutline(boolean)}
+ * @see {@link android.view.View#setClipToOutline(boolean)}
*/
public boolean canClip() {
return !isEmpty() && mRect != null;
}
/**
- * Sets the alpha represented by the Outline.
- *
- * Content producing a fully opaque (alpha = 1.0f) outline is assumed by the drawing system
- * to fully cover content beneath it, meaning content beneath may be optimized away.
+ * Sets the alpha represented by the Outline - the degree to which the
+ * producer is guaranteed to be opaque over the Outline's shape.
+ * <p>
+ * An alpha value of <code>0.0f</code> either represents completely
+ * transparent content, or content that isn't guaranteed to fill the shape
+ * it publishes.
+ * <p>
+ * Content producing a fully opaque (alpha = <code>1.0f</code>) outline is
+ * assumed by the drawing system to fully cover content beneath it,
+ * meaning content beneath may be optimized away.
*/
public void setAlpha(float alpha) {
mAlpha = alpha;
@@ -130,7 +136,8 @@
}
/**
- * Sets the Outline to the rounded rect defined by the input rect, and corner radius.
+ * Sets the Outline to the rounded rect defined by the input rect, and
+ * corner radius.
*/
public void setRect(int left, int top, int right, int bottom) {
setRoundRect(left, top, right, bottom, 0.0f);
@@ -145,7 +152,7 @@
/**
* Sets the Outline to the rounded rect defined by the input rect, and corner radius.
- *
+ * <p>
* Passing a zero radius is equivalent to calling {@link #setRect(int, int, int, int)}
*/
public void setRoundRect(int left, int top, int right, int bottom, float radius) {
@@ -196,7 +203,8 @@
}
/**
- * Sets the Constructs an Outline from a {@link android.graphics.Path#isConvex() convex path}.
+ * Sets the Constructs an Outline from a
+ * {@link android.graphics.Path#isConvex() convex path}.
*/
public void setConvexPath(@NonNull Path convexPath) {
if (convexPath.isEmpty()) {
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 1c76d9c..652fe64 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -1109,9 +1109,16 @@
* This draws a shadow layer below the main layer, with the specified
* offset and color, and blur radius. If radius is 0, then the shadow
* layer is removed.
+ * <p>
+ * Can be used to create a blurred shadow underneath text. Support for use
+ * with other drawing operations is constrained to the software rendering
+ * pipeline.
+ * <p>
+ * The alpha of the shadow will be the paint's alpha if the shadow color is
+ * opaque, or the alpha from the shadow color if not.
*/
- public void setShadowLayer(float radius, float dx, float dy, int color) {
- native_setShadowLayer(mNativePaint, radius, dx, dy, color);
+ public void setShadowLayer(float radius, float dx, float dy, int shadowColor) {
+ native_setShadowLayer(mNativePaint, radius, dx, dy, shadowColor);
}
/**
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 0dc903a..06586ca 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -132,6 +132,9 @@
* @return The best matching typeface.
*/
public static Typeface create(Typeface family, int style) {
+ if (style < 0 || style > 3) {
+ style = 0;
+ }
long ni = 0;
if (family != null) {
// Return early if we're asked for the same face/style
diff --git a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java
index e3c03a9..0bc4fdf 100644
--- a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java
@@ -275,7 +275,7 @@
final int res = a.getResourceId(R.styleable.AnimatedRotateDrawable_drawable, 0);
Drawable drawable = null;
if (res > 0) {
- drawable = r.getDrawable(res);
+ drawable = r.getDrawable(res, theme);
}
a.recycle();
diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
index 2cb7b03..14aa570 100644
--- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
@@ -119,11 +119,11 @@
*
* @param fromId Unique identifier of the starting keyframe
* @param toId Unique identifier of the ending keyframe
- * @param transition An animatable drawable to use as a transition, may not be null
+ * @param transition An {@link Animatable} drawable to use as a transition, may not be null
* @param reversible Whether the transition can be reversed
*/
- public void addTransition(int fromId, int toId, @NonNull Drawable transition,
- boolean reversible) {
+ public <T extends Drawable & Animatable> void addTransition(int fromId, int toId,
+ @NonNull T transition, boolean reversible) {
if (transition == null) {
throw new IllegalArgumentException("Transition drawable must not be null");
}
@@ -427,7 +427,7 @@
final Drawable dr;
if (drawableRes != 0) {
- dr = r.getDrawable(drawableRes);
+ dr = r.getDrawable(drawableRes, theme);
} else {
int type;
while ((type = parser.next()) == XmlPullParser.TEXT) {
@@ -473,7 +473,7 @@
final Drawable dr;
if (drawableRes != 0) {
- dr = r.getDrawable(drawableRes);
+ dr = r.getDrawable(drawableRes, theme);
} else {
int type;
while ((type = parser.next()) == XmlPullParser.TEXT) {
diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java
index cef3377..d87e8e4 100644
--- a/graphics/java/android/graphics/drawable/AnimationDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java
@@ -114,7 +114,9 @@
final boolean changed = super.setVisible(visible, restart);
if (visible) {
if (restart || changed) {
- setFrame(restart ? 0 : mCurFrame, true, mAnimating);
+ boolean startFromZero = restart || mCurFrame < 0 ||
+ mCurFrame >= mAnimationState.getChildCount();
+ setFrame(startFromZero ? 0 : mCurFrame, true, mAnimating);
}
} else {
unscheduleSelf(this);
@@ -313,7 +315,7 @@
Drawable dr;
if (drawableRes != 0) {
- dr = r.getDrawable(drawableRes);
+ dr = r.getDrawable(drawableRes, theme);
} else {
while ((type=parser.next()) == XmlPullParser.TEXT) {
// Empty
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index f5e63ae..715da7e 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -16,6 +16,7 @@
package android.graphics.drawable;
+import android.annotation.NonNull;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
@@ -27,6 +28,7 @@
import android.graphics.ColorFilter;
import android.graphics.Insets;
import android.graphics.Matrix;
+import android.graphics.Outline;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
@@ -79,14 +81,14 @@
private static final int TILE_MODE_REPEAT = 1;
private static final int TILE_MODE_MIRROR = 2;
- private final Rect mDstRect = new Rect(); // Gravity.apply() sets this
+ private final Rect mDstRect = new Rect(); // #updateDstRectAndInsetsIfDirty() sets this
private BitmapState mBitmapState;
private PorterDuffColorFilter mTintFilter;
private int mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;
- private boolean mApplyGravity;
+ private boolean mDstRectAndInsetsDirty = true;
private boolean mMutated;
// These are scaled to match the target density.
@@ -94,7 +96,7 @@
private int mBitmapHeight;
/** Optical insets due to gravity. */
- private Insets mOpticalInsets = null;
+ private Insets mOpticalInsets = Insets.NONE;
// Mirroring matrix for using with Shaders
private Matrix mMirrorMatrix;
@@ -283,7 +285,7 @@
public void setGravity(int gravity) {
if (mBitmapState.mGravity != gravity) {
mBitmapState.mGravity = gravity;
- mApplyGravity = true;
+ mDstRectAndInsetsDirty = true;
invalidateSelf();
}
}
@@ -426,6 +428,7 @@
state.mTileModeX = xmode;
state.mTileModeY = ymode;
state.mRebuildShader = true;
+ mDstRectAndInsetsDirty = true;
invalidateSelf();
}
}
@@ -462,7 +465,7 @@
@Override
protected void onBoundsChange(Rect bounds) {
- mApplyGravity = true;
+ mDstRectAndInsetsDirty = true;
final Shader shader = mBitmapState.mPaint.getShader();
if (shader != null) {
@@ -501,7 +504,6 @@
}
state.mRebuildShader = false;
- copyBounds(mDstRect);
}
final int restoreAlpha;
@@ -521,14 +523,10 @@
clearColorFilter = false;
}
+ updateDstRectAndInsetsIfDirty();
final Shader shader = paint.getShader();
final boolean needMirroring = needMirroring();
if (shader == null) {
- if (mApplyGravity) {
- applyGravity();
- mApplyGravity = false;
- }
-
if (needMirroring) {
canvas.save();
// Mirror the bitmap
@@ -542,11 +540,6 @@
canvas.restore();
}
} else {
- if (mApplyGravity) {
- copyBounds(mDstRect);
- mApplyGravity = false;
- }
-
if (needMirroring) {
// Mirror the bitmap
updateMirrorMatrix(mDstRect.right - mDstRect.left);
@@ -572,29 +565,46 @@
}
}
+ private void updateDstRectAndInsetsIfDirty() {
+ if (mDstRectAndInsetsDirty) {
+ if (mBitmapState.mTileModeX == null && mBitmapState.mTileModeY == null) {
+ final Rect bounds = getBounds();
+ final int layoutDirection = getLayoutDirection();
+ Gravity.apply(mBitmapState.mGravity, mBitmapWidth, mBitmapHeight,
+ bounds, mDstRect, layoutDirection);
+
+ final int left = mDstRect.left - bounds.left;
+ final int top = mDstRect.top - bounds.top;
+ final int right = bounds.right - mDstRect.right;
+ final int bottom = bounds.bottom - mDstRect.bottom;
+ mOpticalInsets = Insets.of(left, top, right, bottom);
+ } else {
+ copyBounds(mDstRect);
+ mOpticalInsets = Insets.NONE;
+ }
+ }
+ mDstRectAndInsetsDirty = false;
+ }
+
/**
* @hide
*/
@Override
public Insets getOpticalInsets() {
- if (mApplyGravity && mBitmapState.mPaint.getShader() == null) {
- applyGravity();
- mApplyGravity = false;
- }
- return mOpticalInsets == null ? Insets.NONE : mOpticalInsets;
+ updateDstRectAndInsetsIfDirty();
+ return mOpticalInsets;
}
- private void applyGravity() {
- final Rect bounds = getBounds();
- final int layoutDirection = getLayoutDirection();
- Gravity.apply(mBitmapState.mGravity, mBitmapWidth, mBitmapHeight,
- bounds, mDstRect, layoutDirection);
+ @Override
+ public void getOutline(@NonNull Outline outline) {
+ updateDstRectAndInsetsIfDirty();
+ outline.setRect(mDstRect);
- final int left = mDstRect.left - bounds.left;
- final int top = mDstRect.top - bounds.top;
- final int right = bounds.right - mDstRect.right;
- final int bottom = bounds.bottom - mDstRect.bottom;
- mOpticalInsets = Insets.of(left, top, right, bottom);
+ // Only opaque Bitmaps can report a non-0 alpha,
+ // since only they are guaranteed to fill their bounds
+ boolean opaqueOverShape = mBitmapState.mBitmap != null
+ && !mBitmapState.mBitmap.hasAlpha();
+ outline.setAlpha(opaqueOverShape ? getAlpha() / 255.0f : 0.0f);
}
@Override
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index a383aab..29b9141 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -820,7 +820,7 @@
@Override
public int getOpacity() {
- return (mAlpha == 255 && mGradientState.mOpaque) ?
+ return (mAlpha == 255 && mGradientState.mOpaqueOverBounds) ?
PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
}
@@ -1413,7 +1413,8 @@
public void getOutline(Outline outline) {
final GradientState st = mGradientState;
final Rect bounds = getBounds();
- outline.setAlpha(mAlpha / 255.0f);
+ // only report non-zero alpha if shape being drawn is opaque
+ outline.setAlpha(st.mOpaqueOverShape ? (mAlpha / 255.0f) : 0.0f);
switch (st.mShape) {
case RECTANGLE:
@@ -1492,7 +1493,8 @@
private int mGradientRadiusType = RADIUS_TYPE_PIXELS;
private boolean mUseLevel;
private boolean mUseLevelForShape;
- private boolean mOpaque;
+ private boolean mOpaqueOverBounds;
+ private boolean mOpaqueOverShape;
int[] mThemeAttrs;
int[] mAttrSize;
@@ -1544,7 +1546,7 @@
mGradientRadiusType = state.mGradientRadiusType;
mUseLevel = state.mUseLevel;
mUseLevelForShape = state.mUseLevelForShape;
- mOpaque = state.mOpaque;
+ mOpaqueOverBounds = state.mOpaqueOverBounds;
mThemeAttrs = state.mThemeAttrs;
mAttrSize = state.mAttrSize;
mAttrGradient = state.mAttrGradient;
@@ -1606,40 +1608,36 @@
}
private void computeOpacity() {
- if (mShape != RECTANGLE) {
- mOpaque = false;
- return;
- }
+ mOpaqueOverBounds = false;
+ mOpaqueOverShape = false;
- if (mRadius > 0 || mRadiusArray != null) {
- mOpaque = false;
- return;
- }
-
+ // First test opacity of all colors
if (mStrokeWidth > 0) {
if (mStrokeColorStateList != null) {
if (!mStrokeColorStateList.isOpaque()) {
- mOpaque = false;
return;
}
}
}
if (mColorStateList != null && !mColorStateList.isOpaque()) {
- mOpaque = false;
return;
}
if (mColors != null) {
for (int i = 0; i < mColors.length; i++) {
if (!isOpaque(mColors[i])) {
- mOpaque = false;
return;
}
}
}
- mOpaque = true;
+ // Colors are opaque, so opaqueOverShape=true,
+ mOpaqueOverShape = true;
+ // and opaqueOverBounds=true if shape fills bounds
+ mOpaqueOverBounds = mShape == RECTANGLE
+ && mRadius <= 0
+ && mRadiusArray == null;
}
private static boolean isOpaque(int color) {
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 588e776..dd0f06f 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -26,10 +26,13 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Insets;
+import android.graphics.Outline;
import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
import android.util.AttributeSet;
-import android.util.Log;
import java.io.IOException;
@@ -50,8 +53,6 @@
* @attr ref android.R.styleable#InsetDrawable_insetBottom
*/
public class InsetDrawable extends Drawable implements Drawable.Callback {
- private static final String LOG_TAG = "InsetDrawable";
-
private final Rect mTmpRect = new Rect();
private InsetState mInsetState;
@@ -86,7 +87,6 @@
final TypedArray a = r.obtainAttributes(attrs, R.styleable.InsetDrawable);
super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible);
updateStateFromTypedArray(a);
- a.recycle();
// Load inner XML elements.
if (mInsetState.mDrawable == null) {
@@ -104,9 +104,17 @@
dr.setCallback(this);
}
- // Verify state.
- if (mInsetState.mDrawable == null) {
- Log.w(LOG_TAG, "No drawable specified for <inset>");
+ verifyRequiredAttributes(a);
+ a.recycle();
+ }
+
+ private void verifyRequiredAttributes(TypedArray a) throws XmlPullParserException {
+ // If we're not waiting on a theme, verify required attributes.
+ if (mInsetState.mDrawable == null && (mInsetState.mThemeAttrs == null
+ || mInsetState.mThemeAttrs[R.styleable.InsetDrawable_drawable] == 0)) {
+ throw new XmlPullParserException(a.getPositionDescription() +
+ ": <inset> tag requires a 'drawable' attribute or "
+ + "child tag defining a drawable");
}
}
@@ -167,6 +175,7 @@
final TypedArray a = t.resolveAttributes(state.mThemeAttrs, R.styleable.InsetDrawable);
try {
updateStateFromTypedArray(a);
+ verifyRequiredAttributes(a);
} catch (XmlPullParserException e) {
throw new RuntimeException(e);
} finally {
@@ -224,12 +233,8 @@
padding.top += mInsetState.mInsetTop;
padding.bottom += mInsetState.mInsetBottom;
- if (pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
- mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0) {
- return true;
- } else {
- return false;
- }
+ return pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
+ mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0;
}
/** @hide */
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 0aa1b0d..c185a9e 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -446,19 +446,8 @@
": <nine-patch> requires a valid 9-patch source image");
}
- // Hey, now might be a good time to actually load optical bounds!
bitmap.getOpticalInsets(opticalInsets);
- // Sanity check for valid padding when we have optical insets.
- if (padding.left < opticalInsets.left) {
- padding.left = opticalInsets.left;
- padding.right = opticalInsets.right;
- }
- if (padding.top < opticalInsets.top) {
- padding.top = opticalInsets.top;
- padding.bottom = opticalInsets.bottom;
- }
-
state.mNinePatch = new NinePatch(bitmap, bitmap.getNinePatchChunk());
state.mPadding = padding;
state.mOpticalInsets = Insets.of(opticalInsets);
@@ -626,21 +615,6 @@
mOpticalInsets = Insets.of(opticalInsets);
mDither = dither;
mAutoMirrored = autoMirror;
-
- // Sanity check for valid padding when we have optical insets.
- if (opticalInsets != null && !opticalInsets.isEmpty()) {
- if (mPadding == null) {
- mPadding = new Rect();
- }
- if (mPadding.left < opticalInsets.left) {
- mPadding.left = opticalInsets.left;
- mPadding.right = opticalInsets.right;
- }
- if (mPadding.top < opticalInsets.top) {
- mPadding.top = opticalInsets.top;
- mPadding.bottom = opticalInsets.bottom;
- }
- }
}
// Copy constructor
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index ea9f732..0447e17 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -395,8 +395,12 @@
mState.mColor = color;
}
- // If we're not waiting on a theme, verify required attributes.
- if (state.mTouchThemeAttrs == null && mState.mColor == null) {
+ verifyRequiredAttributes(a);
+ }
+
+ private void verifyRequiredAttributes(TypedArray a) throws XmlPullParserException {
+ if (mState.mColor == null && (mState.mTouchThemeAttrs == null
+ || mState.mTouchThemeAttrs[R.styleable.RippleDrawable_color] == 0)) {
throw new XmlPullParserException(a.getPositionDescription() +
": <ripple> requires a valid color attribute");
}
@@ -891,7 +895,7 @@
static class RippleState extends LayerState {
int[] mTouchThemeAttrs;
- ColorStateList mColor = null;
+ ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA);
int mMaxRadius = RADIUS_AUTO;
public RippleState(RippleState orig, RippleDrawable owner, Resources res) {
diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java
index 983eb3b..63b9e02 100644
--- a/graphics/java/android/graphics/drawable/RotateDrawable.java
+++ b/graphics/java/android/graphics/drawable/RotateDrawable.java
@@ -436,7 +436,7 @@
com.android.internal.R.styleable.RotateDrawable_drawable, 0);
Drawable drawable = null;
if (res > 0) {
- drawable = r.getDrawable(res);
+ drawable = r.getDrawable(res, theme);
}
a.recycle();
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index 766e681..9ac6927 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -49,7 +49,7 @@
import java.util.Stack;
/**
- * This lets you create a drawable based on an XML vector graphic It can be
+ * This lets you create a drawable based on an XML vector graphic. It can be
* defined in an XML file with the <code><vector></code> element.
* <p/>
* The vector drawable has the following elements:
diff --git a/graphics/java/android/graphics/drawable/shapes/Shape.java b/graphics/java/android/graphics/drawable/shapes/Shape.java
index 589fbaa..eab8666 100644
--- a/graphics/java/android/graphics/drawable/shapes/Shape.java
+++ b/graphics/java/android/graphics/drawable/shapes/Shape.java
@@ -16,6 +16,7 @@
package android.graphics.drawable.shapes;
+import android.annotation.NonNull;
import android.graphics.Canvas;
import android.graphics.Outline;
import android.graphics.Paint;
@@ -93,11 +94,12 @@
protected void onResize(float width, float height) {}
/**
- * Compute the Outline of the shape.
+ * Compute the Outline of the shape and return it in the supplied Outline
+ * parameter. The default implementation does nothing and {@code outline} is not changed.
*
- * The default implementation does not supply an outline.
+ * @param outline The Outline to be populated with the result. Should not be null.
*/
- public void getOutline(Outline outline) {}
+ public void getOutline(@NonNull Outline outline) {}
@Override
public Shape clone() throws CloneNotSupportedException {
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 7661d58..2a4dec0 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -802,11 +802,16 @@
const String8 ResStringPool::string8ObjectAt(size_t idx) const
{
size_t len;
- const char *str = (const char*)string8At(idx, &len);
+ const char *str = string8At(idx, &len);
if (str != NULL) {
- return String8(str);
+ return String8(str, len);
}
- return String8(stringAt(idx, &len));
+
+ const char16_t *str16 = stringAt(idx, &len);
+ if (str16 != NULL) {
+ return String8(str16, len);
+ }
+ return String8();
}
const ResStringPool_span* ResStringPool::styleAt(const ResStringPool_ref& ref) const
@@ -2691,6 +2696,9 @@
case ResTable_config::DENSITY_XXHIGH:
res.append("xxhdpi");
break;
+ case ResTable_config::DENSITY_XXXHIGH:
+ res.append("xxxhdpi");
+ break;
case ResTable_config::DENSITY_NONE:
res.append("nodpi");
break;
@@ -6204,11 +6212,6 @@
if (mError != 0) {
printf("mError=0x%x (%s)\n", mError, strerror(mError));
}
-#if 0
- char localeStr[RESTABLE_MAX_LOCALE_LEN];
- mParams.getBcp47Locale(localeStr);
- printf("mParams=%s,\n" localeStr);
-#endif
size_t pgCount = mPackageGroups.size();
printf("Package Groups (%d)\n", (int)pgCount);
for (size_t pgIndex=0; pgIndex<pgCount; pgIndex++) {
diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp
index 8016a82..89d271d0 100644
--- a/libs/androidfw/tests/ResTable_test.cpp
+++ b/libs/androidfw/tests/ResTable_test.cpp
@@ -195,4 +195,20 @@
ASSERT_EQ(uint32_t(400), val.data);
}
+TEST(ResTableTest, emptyTableHasSensibleDefaults) {
+ const int32_t assetCookie = 1;
+
+ ResTable table;
+ ASSERT_EQ(NO_ERROR, table.addEmpty(assetCookie));
+
+ // Adding an empty table gives us one table!
+ ASSERT_EQ(uint32_t(1), table.getTableCount());
+
+ // Adding an empty table doesn't mean we get packages.
+ ASSERT_EQ(uint32_t(0), table.getBasePackageCount());
+
+ Res_value val;
+ ASSERT_LT(table.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG), 0);
+}
+
}
diff --git a/libs/hwui/Animator.cpp b/libs/hwui/Animator.cpp
index 5ecd77a..78d569d 100644
--- a/libs/hwui/Animator.cpp
+++ b/libs/hwui/Animator.cpp
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#define LOG_TAG "RT-Animator"
-
#include "Animator.h"
#include <inttypes.h>
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 7bd0798..5689e17 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -703,6 +703,8 @@
propertyLightPosY = -1.0f;
propertyLightPosZ = -1.0f;
propertyAmbientRatio = -1.0f;
+ propertyAmbientShadowStrength = -1;
+ propertySpotShadowStrength = -1;
}
void Caches::setTempProperty(const char* name, const char* value) {
@@ -723,6 +725,14 @@
propertyLightPosZ = fmin(fmax(atof(value), 0.0), 3000.0);
ALOGD("lightPos Z = %.2f", propertyLightPosZ);
return;
+ } else if (!strcmp(name, "ambientShadowStrength")) {
+ propertyAmbientShadowStrength = atoi(value);
+ ALOGD("ambient shadow strength = 0x%x out of 0xff", propertyAmbientShadowStrength);
+ return;
+ } else if (!strcmp(name, "spotShadowStrength")) {
+ propertySpotShadowStrength = atoi(value);
+ ALOGD("spot shadow strength = 0x%x out of 0xff", propertySpotShadowStrength);
+ return;
}
ALOGD(" failed");
}
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h
index e00cb0b..0482430 100644
--- a/libs/hwui/Caches.h
+++ b/libs/hwui/Caches.h
@@ -366,6 +366,9 @@
float propertyLightPosY;
float propertyLightPosZ;
float propertyAmbientRatio;
+ int propertyAmbientShadowStrength;
+ int propertySpotShadowStrength;
+
private:
enum OverdrawColorSet {
kColorSet_Default = 0,
diff --git a/libs/hwui/DamageAccumulator.cpp b/libs/hwui/DamageAccumulator.cpp
index 15bed58..054a164 100644
--- a/libs/hwui/DamageAccumulator.cpp
+++ b/libs/hwui/DamageAccumulator.cpp
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#define LOG_TAG "DamageAccumulator"
-
#include "DamageAccumulator.h"
#include <cutils/log.h>
@@ -26,12 +24,6 @@
namespace android {
namespace uirenderer {
-NullDamageAccumulator NullDamageAccumulator::sInstance;
-
-NullDamageAccumulator* NullDamageAccumulator::instance() {
- return &sInstance;
-}
-
enum TransformType {
TransformInvalid = 0,
TransformRenderNode,
@@ -60,6 +52,30 @@
mHead->type = TransformNone;
}
+static void computeTransformImpl(const DirtyStack* currentFrame, Matrix4* outMatrix) {
+ if (currentFrame->prev != currentFrame) {
+ computeTransformImpl(currentFrame->prev, outMatrix);
+ }
+ switch (currentFrame->type) {
+ case TransformRenderNode:
+ currentFrame->renderNode->applyViewPropertyTransforms(*outMatrix);
+ break;
+ case TransformMatrix4:
+ outMatrix->multiply(*currentFrame->matrix4);
+ break;
+ case TransformNone:
+ // nothing to be done
+ break;
+ default:
+ LOG_ALWAYS_FATAL("Tried to compute transform with an invalid type: %d", currentFrame->type);
+ }
+}
+
+void DamageAccumulator::computeCurrentTransform(Matrix4* outMatrix) const {
+ outMatrix->loadIdentity();
+ computeTransformImpl(mHead, outMatrix);
+}
+
void DamageAccumulator::pushCommon() {
if (!mHead->next) {
DirtyStack* nextFrame = (DirtyStack*) mAllocator.alloc(sizeof(DirtyStack));
diff --git a/libs/hwui/DamageAccumulator.h b/libs/hwui/DamageAccumulator.h
index 90d9425..6f0bd8c 100644
--- a/libs/hwui/DamageAccumulator.h
+++ b/libs/hwui/DamageAccumulator.h
@@ -31,18 +31,7 @@
class RenderNode;
class Matrix4;
-class IDamageAccumulator {
-public:
- virtual void pushTransform(const RenderNode* transform) = 0;
- virtual void pushTransform(const Matrix4* transform) = 0;
- virtual void popTransform() = 0;
- virtual void dirty(float left, float top, float right, float bottom) = 0;
- virtual void peekAtDirty(SkRect* dest) = 0;
-protected:
- virtual ~IDamageAccumulator() {}
-};
-
-class DamageAccumulator : public IDamageAccumulator {
+class DamageAccumulator {
PREVENT_COPY_AND_ASSIGN(DamageAccumulator);
public:
DamageAccumulator();
@@ -51,17 +40,19 @@
// Push a transform node onto the stack. This should be called prior
// to any dirty() calls. Subsequent calls to dirty()
// will be affected by the transform when popTransform() is called.
- virtual void pushTransform(const RenderNode* transform);
- virtual void pushTransform(const Matrix4* transform);
+ void pushTransform(const RenderNode* transform);
+ void pushTransform(const Matrix4* transform);
// Pops a transform node from the stack, propagating the dirty rect
// up to the parent node. Returns the IDamageTransform that was just applied
- virtual void popTransform();
+ void popTransform();
- virtual void dirty(float left, float top, float right, float bottom);
+ void dirty(float left, float top, float right, float bottom);
// Returns the current dirty area, *NOT* transformed by pushed transforms
- virtual void peekAtDirty(SkRect* dest);
+ void peekAtDirty(SkRect* dest);
+
+ void computeCurrentTransform(Matrix4* outMatrix) const;
void finish(SkRect* totalDirty);
@@ -74,24 +65,6 @@
DirtyStack* mHead;
};
-class NullDamageAccumulator : public IDamageAccumulator {
- PREVENT_COPY_AND_ASSIGN(NullDamageAccumulator);
-public:
- virtual void pushTransform(const RenderNode* transform) { }
- virtual void pushTransform(const Matrix4* transform) { }
- virtual void popTransform() { }
- virtual void dirty(float left, float top, float right, float bottom) { }
- virtual void peekAtDirty(SkRect* dest) { dest->setEmpty(); }
-
- ANDROID_API static NullDamageAccumulator* instance();
-
-private:
- NullDamageAccumulator() {}
- ~NullDamageAccumulator() {}
-
- static NullDamageAccumulator sInstance;
-};
-
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index c6d3db7..5f533a7 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -208,6 +208,8 @@
// ensure that local bounds cover mapped bounds
if (!state.mMatrix.isSimple()) return false;
+ if (state.mRoundRectClipState) return false;
+
// check state/paint for transparency
if (mPaint) {
if (mPaint->getShader() && !mPaint->getShader()->isOpaque()) {
@@ -999,6 +1001,8 @@
public:
DrawStrokableOp(float left, float top, float right, float bottom, const SkPaint* paint)
: DrawBoundedOp(left, top, right, bottom, paint) {};
+ DrawStrokableOp(const Rect& localBounds, const SkPaint* paint)
+ : DrawBoundedOp(localBounds, paint) {};
virtual bool getLocalBounds(Rect& localBounds) {
localBounds.set(mLocalBounds);
@@ -1337,11 +1341,11 @@
const float* mPositions;
};
-class DrawTextOp : public DrawBoundedOp {
+class DrawTextOp : public DrawStrokableOp {
public:
DrawTextOp(const char* text, int bytesCount, int count, float x, float y,
const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds)
- : DrawBoundedOp(bounds, paint), mText(text), mBytesCount(bytesCount), mCount(count),
+ : DrawStrokableOp(bounds, paint), mText(text), mBytesCount(bytesCount), mCount(count),
mX(x), mY(y), mPositions(positions), mTotalAdvance(totalAdvance) {
mPrecacheTransform = SkMatrix::InvalidMatrix();
}
diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp
index f0a6e55..9a9c544 100644
--- a/libs/hwui/DisplayListRenderer.cpp
+++ b/libs/hwui/DisplayListRenderer.cpp
@@ -66,7 +66,7 @@
"prepareDirty called a second time during a recording!");
mDisplayListData = new DisplayListData();
- initializeSaveStack(0, 0, getWidth(), getHeight());
+ initializeSaveStack(0, 0, getWidth(), getHeight(), Vector3());
mDirtyClip = opaque;
mRestoreSaveCount = -1;
@@ -376,7 +376,7 @@
float x, float y, const float* positions, const SkPaint* paint,
float totalAdvance, const Rect& bounds, DrawOpMode drawOpMode) {
- if (!text || count <= 0) return DrawGlInfo::kStatusDone;
+ if (!text || count <= 0 || paintWillNotDrawText(*paint)) return DrawGlInfo::kStatusDone;
text = refText(text, bytesCount);
positions = refBuffer<float>(positions, count * 2);
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index d05cabc..8639ae1 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -53,6 +53,7 @@
deferredList = NULL;
convexMask = NULL;
caches.resourceCache.incrementRefcount(this);
+ rendererLightPosDirty = true;
}
Layer::~Layer() {
@@ -80,6 +81,17 @@
}
}
+void Layer::updateLightPosFromRenderer(const OpenGLRenderer& rootRenderer) {
+ if (renderer && rendererLightPosDirty) {
+ // re-init renderer's light position, based upon last cached location in window
+ Vector3 lightPos = rootRenderer.getLightCenter();
+ cachedInvTransformInWindow.mapPoint3d(lightPos);
+ renderer->initLight(lightPos, rootRenderer.getLightRadius(),
+ rootRenderer.getAmbientShadowAlpha(), rootRenderer.getSpotShadowAlpha());
+ rendererLightPosDirty = false;
+ }
+}
+
bool Layer::resize(const uint32_t width, const uint32_t height) {
uint32_t desiredWidth = computeIdealWidth(width);
uint32_t desiredHeight = computeIdealWidth(height);
@@ -203,7 +215,8 @@
}
}
-void Layer::defer() {
+void Layer::defer(const OpenGLRenderer& rootRenderer) {
+ updateLightPosFromRenderer(rootRenderer);
const float width = layer.getWidth();
const float height = layer.getHeight();
@@ -253,7 +266,8 @@
}
}
-void Layer::render() {
+void Layer::render(const OpenGLRenderer& rootRenderer) {
+ updateLightPosFromRenderer(rootRenderer);
renderer->setViewport(layer.getWidth(), layer.getHeight());
renderer->prepareDirty(dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom,
!isBlend());
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index 0bf05d0..38c29c7 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -86,6 +86,11 @@
regionRect.translate(layer.left, layer.top);
}
+ void setWindowTransform(Matrix4& windowTransform) {
+ cachedInvTransformInWindow.loadInverse(windowTransform);
+ rendererLightPosDirty = true;
+ }
+
void updateDeferred(RenderNode* renderNode, int left, int top, int right, int bottom);
inline uint32_t getWidth() const {
@@ -257,10 +262,10 @@
return transform;
}
- void defer();
+ void defer(const OpenGLRenderer& rootRenderer);
void cancelDefer();
void flush();
- void render();
+ void render(const OpenGLRenderer& rootRenderer);
/**
* Bounds of the layer.
@@ -304,6 +309,7 @@
private:
void requireRenderer();
+ void updateLightPosFromRenderer(const OpenGLRenderer& rootRenderer);
Caches& caches;
@@ -383,6 +389,12 @@
mat4 transform;
/**
+ * Cached transform of layer in window, updated only on creation / resize
+ */
+ mat4 cachedInvTransformInWindow;
+ bool rendererLightPosDirty;
+
+ /**
* Used to defer display lists when the layer is updated with a
* display list.
*/
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index d1522b6..bbf0551 100755
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -188,8 +188,7 @@
void OpenGLRenderer::setupFrameState(float left, float top,
float right, float bottom, bool opaque) {
mCaches.clearGarbage();
-
- initializeSaveStack(left, top, right, bottom);
+ initializeSaveStack(left, top, right, bottom, mLightCenter);
mOpaque = opaque;
mTilingClip.set(left, top, right, bottom);
}
@@ -481,9 +480,9 @@
}
if (CC_UNLIKELY(inFrame || mCaches.drawDeferDisabled)) {
- layer->render();
+ layer->render(*this);
} else {
- layer->defer();
+ layer->defer(*this);
}
if (inFrame) {
@@ -2519,8 +2518,9 @@
status_t OpenGLRenderer::drawRoundRect(float left, float top, float right, float bottom,
float rx, float ry, const SkPaint* p) {
- if (currentSnapshot()->isIgnored() || quickRejectSetupScissor(left, top, right, bottom, p) ||
- (p->getAlpha() == 0 && getXfermode(p->getXfermode()) != SkXfermode::kClear_Mode)) {
+ if (currentSnapshot()->isIgnored()
+ || quickRejectSetupScissor(left, top, right, bottom, p)
+ || paintWillNotDraw(*p)) {
return DrawGlInfo::kStatusDone;
}
@@ -2537,9 +2537,9 @@
}
status_t OpenGLRenderer::drawCircle(float x, float y, float radius, const SkPaint* p) {
- if (currentSnapshot()->isIgnored() || quickRejectSetupScissor(x - radius, y - radius,
- x + radius, y + radius, p) ||
- (p->getAlpha() == 0 && getXfermode(p->getXfermode()) != SkXfermode::kClear_Mode)) {
+ if (currentSnapshot()->isIgnored()
+ || quickRejectSetupScissor(x - radius, y - radius, x + radius, y + radius, p)
+ || paintWillNotDraw(*p)) {
return DrawGlInfo::kStatusDone;
}
if (p->getPathEffect() != 0) {
@@ -2559,8 +2559,9 @@
status_t OpenGLRenderer::drawOval(float left, float top, float right, float bottom,
const SkPaint* p) {
- if (currentSnapshot()->isIgnored() || quickRejectSetupScissor(left, top, right, bottom, p) ||
- (p->getAlpha() == 0 && getXfermode(p->getXfermode()) != SkXfermode::kClear_Mode)) {
+ if (currentSnapshot()->isIgnored()
+ || quickRejectSetupScissor(left, top, right, bottom, p)
+ || paintWillNotDraw(*p)) {
return DrawGlInfo::kStatusDone;
}
@@ -2581,8 +2582,9 @@
status_t OpenGLRenderer::drawArc(float left, float top, float right, float bottom,
float startAngle, float sweepAngle, bool useCenter, const SkPaint* p) {
- if (currentSnapshot()->isIgnored() || quickRejectSetupScissor(left, top, right, bottom, p) ||
- (p->getAlpha() == 0 && getXfermode(p->getXfermode()) != SkXfermode::kClear_Mode)) {
+ if (currentSnapshot()->isIgnored()
+ || quickRejectSetupScissor(left, top, right, bottom, p)
+ || paintWillNotDraw(*p)) {
return DrawGlInfo::kStatusDone;
}
@@ -2615,8 +2617,9 @@
status_t OpenGLRenderer::drawRect(float left, float top, float right, float bottom,
const SkPaint* p) {
- if (currentSnapshot()->isIgnored() || quickRejectSetupScissor(left, top, right, bottom, p) ||
- (p->getAlpha() == 0 && getXfermode(p->getXfermode()) != SkXfermode::kClear_Mode)) {
+ if (currentSnapshot()->isIgnored()
+ || quickRejectSetupScissor(left, top, right, bottom, p)
+ || paintWillNotDraw(*p)) {
return DrawGlInfo::kStatusDone;
}
@@ -3166,13 +3169,22 @@
SkPaint paint;
paint.setAntiAlias(true); // want to use AlphaVertex
- if (ambientShadowVertexBuffer && mAmbientShadowAlpha > 0) {
- paint.setARGB(casterAlpha * mAmbientShadowAlpha, 0, 0, 0);
+ // The caller has made sure casterAlpha > 0.
+ float ambientShadowAlpha = mAmbientShadowAlpha;
+ if (CC_UNLIKELY(mCaches.propertyAmbientShadowStrength >= 0)) {
+ ambientShadowAlpha = mCaches.propertyAmbientShadowStrength;
+ }
+ if (ambientShadowVertexBuffer && ambientShadowAlpha > 0) {
+ paint.setARGB(casterAlpha * ambientShadowAlpha, 0, 0, 0);
drawVertexBuffer(*ambientShadowVertexBuffer, &paint, kVertexBuffer_ShadowInterp);
}
- if (spotShadowVertexBuffer && mSpotShadowAlpha > 0) {
- paint.setARGB(casterAlpha * mSpotShadowAlpha, 0, 0, 0);
+ float spotShadowAlpha = mSpotShadowAlpha;
+ if (CC_UNLIKELY(mCaches.propertySpotShadowStrength >= 0)) {
+ spotShadowAlpha = mCaches.propertySpotShadowStrength;
+ }
+ if (spotShadowVertexBuffer && spotShadowAlpha > 0) {
+ paint.setARGB(casterAlpha * spotShadowAlpha, 0, 0, 0);
drawVertexBuffer(*spotShadowVertexBuffer, &paint, kVertexBuffer_ShadowInterp);
}
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index fc95c18..e9ca5d9 100755
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -345,8 +345,10 @@
}
#endif
- const Vector3& getLightCenter() const { return mLightCenter; }
+ const Vector3& getLightCenter() const { return currentSnapshot()->getRelativeLightCenter(); }
float getLightRadius() const { return mLightRadius; }
+ uint8_t getAmbientShadowAlpha() const { return mAmbientShadowAlpha; }
+ uint8_t getSpotShadowAlpha() const { return mSpotShadowAlpha; }
protected:
/**
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index e3732a1..0db6198 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -116,6 +116,7 @@
void RenderNode::prepareTree(TreeInfo& info) {
ATRACE_CALL();
+ LOG_ALWAYS_FATAL_IF(!info.damageAccumulator, "DamageAccumulator missing");
prepareTreeImpl(info);
}
@@ -163,16 +164,26 @@
return;
}
+ bool transformUpdateNeeded = false;
if (!mLayer) {
mLayer = LayerRenderer::createRenderLayer(info.renderState, getWidth(), getHeight());
applyLayerPropertiesToLayer(info);
damageSelf(info);
+ transformUpdateNeeded = true;
} else if (mLayer->layer.getWidth() != getWidth() || mLayer->layer.getHeight() != getHeight()) {
if (!LayerRenderer::resizeLayer(mLayer, getWidth(), getHeight())) {
LayerRenderer::destroyLayer(mLayer);
mLayer = 0;
}
damageSelf(info);
+ transformUpdateNeeded = true;
+ }
+
+ if (transformUpdateNeeded) {
+ // update the transform in window of the layer to reset its origin wrt light source position
+ Matrix4 windowTransform;
+ info.damageAccumulator->computeCurrentTransform(&windowTransform);
+ mLayer->setWindowTransform(windowTransform);
}
SkRect dirty;
@@ -406,7 +417,7 @@
* If true3dTransform is set to true, the transform applied to the input matrix will use true 4x4
* matrix computation instead of the Skia 3x3 matrix + camera hackery.
*/
-void RenderNode::applyViewPropertyTransforms(mat4& matrix, bool true3dTransform) {
+void RenderNode::applyViewPropertyTransforms(mat4& matrix, bool true3dTransform) const {
if (properties().getLeft() != 0 || properties().getTop() != 0) {
matrix.translate(properties().getLeft(), properties().getTop());
}
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index fa310e0..afa17d5 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -174,6 +174,8 @@
// UI thread only!
ANDROID_API void addAnimator(const sp<BaseRenderNodeAnimator>& animator);
+ void applyViewPropertyTransforms(mat4& matrix, bool true3dTransform = false) const;
+
private:
typedef key_value_pair_t<float, DrawRenderNodeOp*> ZDrawRenderNodeOpPair;
@@ -189,8 +191,6 @@
kPositiveZChildren
};
- void applyViewPropertyTransforms(mat4& matrix, bool true3dTransform = false);
-
void computeOrderingImpl(DrawRenderNodeOp* opState,
const SkPath* outlineOfProjectionSurface,
Vector<DrawRenderNodeOp*>* compositedChildrenOfProjectionSurface,
diff --git a/libs/hwui/Renderer.h b/libs/hwui/Renderer.h
index f5cd266..6d4bb4a 100644
--- a/libs/hwui/Renderer.h
+++ b/libs/hwui/Renderer.h
@@ -67,6 +67,18 @@
return resultMode;
}
+ // TODO: move to a method on android:Paint
+ static inline bool paintWillNotDraw(const SkPaint& paint) {
+ return paint.getAlpha() == 0
+ && getXfermode(paint.getXfermode()) != SkXfermode::kClear_Mode;
+ }
+
+ // TODO: move to a method on android:Paint
+ static inline bool paintWillNotDrawText(const SkPaint& paint) {
+ return paint.getAlpha() == 0
+ && paint.getLooper() == NULL
+ && getXfermode(paint.getXfermode()) == SkXfermode::kSrcOver_Mode;
+ }
// ----------------------------------------------------------------------------
// Frame state operations
// ----------------------------------------------------------------------------
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index 6f19275..ecc47d2 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -55,7 +55,8 @@
, empty(false)
, alpha(s->alpha)
, roundRectClipState(s->roundRectClipState)
- , mViewportData(s->mViewportData) {
+ , mViewportData(s->mViewportData)
+ , mRelativeLightCenter(s->mRelativeLightCenter) {
if (saveFlags & SkCanvas::kMatrix_SaveFlag) {
mTransformRoot.load(*s->transform);
transform = &mTransformRoot;
@@ -200,6 +201,13 @@
///////////////////////////////////////////////////////////////////////////////
void Snapshot::resetTransform(float x, float y, float z) {
+ // before resetting, map current light pos with inverse of current transform
+ Vector3 center = mRelativeLightCenter;
+ mat4 inverse;
+ inverse.loadInverse(*transform);
+ inverse.mapPoint3d(center);
+ mRelativeLightCenter = center;
+
transform = &mTransformRoot;
transform->loadTranslate(x, y, z);
}
diff --git a/libs/hwui/Snapshot.h b/libs/hwui/Snapshot.h
index 98e2440..ad4ee9d 100644
--- a/libs/hwui/Snapshot.h
+++ b/libs/hwui/Snapshot.h
@@ -161,6 +161,9 @@
int getViewportHeight() const { return mViewportData.mHeight; }
const Matrix4& getOrthoMatrix() const { return mViewportData.mOrthoMatrix; }
+ const Vector3& getRelativeLightCenter() const { return mRelativeLightCenter; }
+ void setRelativeLightCenter(const Vector3& lightCenter) { mRelativeLightCenter = lightCenter; }
+
/**
* Sets (and replaces) the current clipping outline
*/
@@ -302,6 +305,7 @@
SkRegion mClipRegionRoot;
ViewportData mViewportData;
+ Vector3 mRelativeLightCenter;
}; // class Snapshot
diff --git a/libs/hwui/StatefulBaseRenderer.cpp b/libs/hwui/StatefulBaseRenderer.cpp
index dc41157..06c5ab4 100644
--- a/libs/hwui/StatefulBaseRenderer.cpp
+++ b/libs/hwui/StatefulBaseRenderer.cpp
@@ -35,11 +35,12 @@
}
void StatefulBaseRenderer::initializeSaveStack(float clipLeft, float clipTop,
- float clipRight, float clipBottom) {
+ float clipRight, float clipBottom, const Vector3& lightCenter) {
mSnapshot = new Snapshot(mFirstSnapshot,
SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
mSnapshot->setClip(clipLeft, clipTop, clipRight, clipBottom);
mSnapshot->fbo = getTargetFbo();
+ mSnapshot->setRelativeLightCenter(lightCenter);
mSaveCount = 1;
}
diff --git a/libs/hwui/StatefulBaseRenderer.h b/libs/hwui/StatefulBaseRenderer.h
index 6d83b4c..3957d36 100644
--- a/libs/hwui/StatefulBaseRenderer.h
+++ b/libs/hwui/StatefulBaseRenderer.h
@@ -52,7 +52,8 @@
* the render target.
*/
virtual void setViewport(int width, int height);
- void initializeSaveStack(float clipLeft, float clipTop, float clipRight, float clipBottom);
+ void initializeSaveStack(float clipLeft, float clipTop, float clipRight, float clipBottom,
+ const Vector3& lightCenter);
// getters
bool hasRectToRectTransform() const {
diff --git a/libs/hwui/TessellationCache.cpp b/libs/hwui/TessellationCache.cpp
index c5fc21f..0a9aeb8 100644
--- a/libs/hwui/TessellationCache.cpp
+++ b/libs/hwui/TessellationCache.cpp
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-#define LOG_TAG "OpenGLRenderer"
-#define ATRACE_TAG ATRACE_TAG_VIEW
-
#include <utils/JenkinsHash.h>
#include <utils/Trace.h>
diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h
index de09755..331f157 100644
--- a/libs/hwui/TreeInfo.h
+++ b/libs/hwui/TreeInfo.h
@@ -65,7 +65,7 @@
, frameTimeMs(0)
, animationHook(NULL)
, prepareTextures(mode == MODE_FULL)
- , damageAccumulator(NullDamageAccumulator::instance())
+ , damageAccumulator(NULL)
, renderState(renderState)
, renderer(NULL)
, errorHandler(NULL)
@@ -88,8 +88,9 @@
// TODO: Remove this? Currently this is used to signal to stop preparing
// textures if we run out of cache space.
bool prepareTextures;
- // Must not be null
- IDamageAccumulator* damageAccumulator;
+
+ // Must not be null during actual usage
+ DamageAccumulator* damageAccumulator;
RenderState& renderState;
// The renderer that will be drawing the next frame. Use this to push any
// layer updates or similar. May be NULL.
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
index 2ea6c8c..ba878bac 100644
--- a/libs/hwui/font/Font.cpp
+++ b/libs/hwui/font/Font.cpp
@@ -140,12 +140,12 @@
void Font::measureCachedGlyph(CachedGlyphInfo *glyph, int x, int y,
uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) {
- int nPenX = x + glyph->mBitmapLeft;
- int nPenY = y + glyph->mBitmapTop;
-
int width = (int) glyph->mBitmapWidth;
int height = (int) glyph->mBitmapHeight;
+ int nPenX = x + glyph->mBitmapLeft;
+ int nPenY = y + glyph->mBitmapTop;
+
if (bounds->bottom > nPenY) {
bounds->bottom = nPenY;
}
@@ -162,12 +162,12 @@
void Font::drawCachedGlyph(CachedGlyphInfo* glyph, int x, int y,
uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) {
- float nPenX = x + glyph->mBitmapLeft;
- float nPenY = y + glyph->mBitmapTop + glyph->mBitmapHeight;
-
float width = (float) glyph->mBitmapWidth;
float height = (float) glyph->mBitmapHeight;
+ float nPenX = x + glyph->mBitmapLeft;
+ float nPenY = y + glyph->mBitmapTop + height;
+
float u1 = glyph->mBitmapMinU;
float u2 = glyph->mBitmapMaxU;
float v1 = glyph->mBitmapMinV;
@@ -181,10 +181,13 @@
void Font::drawCachedGlyphTransformed(CachedGlyphInfo* glyph, int x, int y,
uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) {
+ float width = (float) glyph->mBitmapWidth;
+ float height = (float) glyph->mBitmapHeight;
+
SkPoint p[4];
- p[0].iset(glyph->mBitmapLeft, glyph->mBitmapTop + glyph->mBitmapHeight);
- p[1].iset(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop + glyph->mBitmapHeight);
- p[2].iset(glyph->mBitmapLeft + glyph->mBitmapWidth, glyph->mBitmapTop);
+ p[0].iset(glyph->mBitmapLeft, glyph->mBitmapTop + height);
+ p[1].iset(glyph->mBitmapLeft + width, glyph->mBitmapTop + height);
+ p[2].iset(glyph->mBitmapLeft + width, glyph->mBitmapTop);
p[3].iset(glyph->mBitmapLeft, glyph->mBitmapTop);
mDescription.mInverseLookupTransform.mapPoints(p, 4);
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 756f660..e673b0d 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#define LOG_TAG "CanvasContext"
-
#include "CanvasContext.h"
#include <private/hwui/DrawGlInfo.h>
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 986e808..d9b96f6c 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#define LOG_TAG "RenderProxy"
-
#include "RenderProxy.h"
#include "CanvasContext.h"
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 03e98d5..403e164 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#define LOG_TAG "RenderThread"
-
#include "RenderThread.h"
+#if defined(HAVE_PTHREADS)
+#include <sys/resource.h>
+#endif
#include <gui/DisplayEventReceiver.h>
#include <utils/Log.h>
@@ -244,6 +245,9 @@
}
bool RenderThread::threadLoop() {
+#if defined(HAVE_PTHREADS)
+ setpriority(PRIO_PROCESS, 0, PRIORITY_DISPLAY);
+#endif
initThreadLocals();
int timeoutMillis = -1;
diff --git a/libs/hwui/thread/TaskManager.cpp b/libs/hwui/thread/TaskManager.cpp
index 3d2b0d9..cb5401c 100644
--- a/libs/hwui/thread/TaskManager.cpp
+++ b/libs/hwui/thread/TaskManager.cpp
@@ -15,6 +15,9 @@
*/
#include <sys/sysinfo.h>
+#if defined(HAVE_PTHREADS)
+#include <sys/resource.h>
+#endif
#include "TaskManager.h"
#include "Task.h"
@@ -79,6 +82,13 @@
// Thread
///////////////////////////////////////////////////////////////////////////////
+status_t TaskManager::WorkerThread::readyToRun() {
+#if defined(HAVE_PTHREADS)
+ setpriority(PRIO_PROCESS, 0, PRIORITY_FOREGROUND);
+#endif
+ return NO_ERROR;
+}
+
bool TaskManager::WorkerThread::threadLoop() {
mSignal.wait();
Vector<TaskWrapper> tasks;
diff --git a/libs/hwui/thread/TaskManager.h b/libs/hwui/thread/TaskManager.h
index f2a216f..5a933ab 100644
--- a/libs/hwui/thread/TaskManager.h
+++ b/libs/hwui/thread/TaskManager.h
@@ -84,6 +84,7 @@
void exit();
private:
+ virtual status_t readyToRun();
virtual bool threadLoop();
// Lock for the list of tasks
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index b33ba00..5a286ee 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -209,7 +209,9 @@
// if not to popup dialog immediately, pending intent will open the dialog
Intent intent = !mPopupImmediately ? getDlgIntent(notif) : new Intent();
- PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, intent, 0);
+ PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, intent, 0);
+ mNiNotification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
mNiNotification.setLatestEventInfo(mContext, title, message, pi);
notificationManager.notifyAsUser(null, notif.notificationId, mNiNotification,
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index bd50142..e69c456 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1672,24 +1672,6 @@
/**
* @hide
- * Checks whether any local or remote media playback is active.
- * Local playback refers to playback for instance on the device's speakers or wired headphones.
- * Remote playback refers to playback for instance on a wireless display mirroring the
- * devices's, or on a device using a Cast-like protocol.
- * @return true if media playback, from which the device is aware, is active.
- */
- public boolean isLocalOrRemoteMusicActive() {
- IAudioService service = getService();
- try {
- return service.isLocalOrRemoteMusicActive();
- } catch (RemoteException e) {
- Log.e(TAG, "Dead object in isLocalOrRemoteMusicActive()", e);
- return false;
- }
- }
-
- /**
- * @hide
* Checks whether the current audio focus is exclusive.
* @return true if the top of the audio focus stack requested focus
* with {@link #AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE}
@@ -2350,18 +2332,21 @@
}
/**
- * Registers a {@link RemoteController} instance for it to receive media metadata updates
- * and playback state information from applications using {@link RemoteControlClient}, and
- * control their playback.
- * <p>Registration requires the {@link OnClientUpdateListener} listener to be one of the
- * enabled notification listeners (see
+ * Registers a {@link RemoteController} instance for it to receive media
+ * metadata updates and playback state information from applications using
+ * {@link RemoteControlClient}, and control their playback.
+ * <p>
+ * Registration requires the {@link OnClientUpdateListener} listener to be
+ * one of the enabled notification listeners (see
* {@link android.service.notification.NotificationListenerService}).
+ *
* @param rctlr the object to register.
- * @return true if the {@link RemoteController} was successfully registered, false if an
- * error occurred, due to an internal system error, or insufficient permissions.
+ * @return true if the {@link RemoteController} was successfully registered,
+ * false if an error occurred, due to an internal system error, or
+ * insufficient permissions.
* @deprecated Use
- * {@link MediaSessionManager#addActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener, ComponentName)}
- * and {@link MediaController} instead.
+ * {@link MediaSessionManager#addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, ComponentName)}
+ * and {@link MediaController} instead.
*/
@Deprecated
public boolean registerRemoteController(RemoteController rctlr) {
@@ -2373,12 +2358,14 @@
}
/**
- * Unregisters a {@link RemoteController}, causing it to no longer receive media metadata and
- * playback state information, and no longer be capable of controlling playback.
+ * Unregisters a {@link RemoteController}, causing it to no longer receive
+ * media metadata and playback state information, and no longer be capable
+ * of controlling playback.
+ *
* @param rctlr the object to unregister.
* @deprecated Use
- * {@link MediaSessionManager#removeActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener)}
- * instead.
+ * {@link MediaSessionManager#removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener)}
+ * instead.
*/
@Deprecated
public void unregisterRemoteController(RemoteController rctlr) {
diff --git a/media/java/android/media/AudioManagerInternal.java b/media/java/android/media/AudioManagerInternal.java
new file mode 100644
index 0000000..6f1bdef
--- /dev/null
+++ b/media/java/android/media/AudioManagerInternal.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.media;
+
+import com.android.server.LocalServices;
+
+/**
+ * Class for system services to access extra AudioManager functionality. The
+ * AudioService is responsible for registering an implementation with
+ * {@link LocalServices}.
+ *
+ * @hide
+ */
+public abstract class AudioManagerInternal {
+
+ public abstract void adjustStreamVolumeForUid(int streamType, int direction, int flags,
+ String callingPackage, int uid);
+
+ public abstract void setStreamVolumeForUid(int streamType, int direction, int flags,
+ String callingPackage, int uid);
+}
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index c6489a6..0af2457 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -79,6 +79,7 @@
import com.android.internal.telephony.ITelephony;
import com.android.internal.util.XmlUtils;
+import com.android.server.LocalServices;
import org.xmlpull.v1.XmlPullParserException;
@@ -481,11 +482,6 @@
final RemoteCallbackList<IAudioRoutesObserver> mRoutesObservers
= new RemoteCallbackList<IAudioRoutesObserver>();
- /**
- * A fake stream type to match the notion of remote media playback
- */
- public final static int STREAM_REMOTE_MUSIC = -200;
-
// Devices for which the volume is fixed and VolumePanel slider should be disabled
int mFixedVolumeDevices = AudioSystem.DEVICE_OUT_HDMI |
AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET |
@@ -635,6 +631,7 @@
mMasterVolumeRamp = context.getResources().getIntArray(
com.android.internal.R.array.config_masterVolumeRamp);
+ LocalServices.addService(AudioManagerInternal.class, new AudioServiceInternal());
}
public void systemReady() {
@@ -896,27 +893,6 @@
///////////////////////////////////////////////////////////////////////////
// IPC methods
///////////////////////////////////////////////////////////////////////////
- /** @see AudioManager#isLocalOrRemoteMusicActive() */
- public boolean isLocalOrRemoteMusicActive() {
- if (AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0)) {
- // local / wired / BT playback active
- if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): local");
- return true;
- }
- if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC)) {
- // remote "cast-like" playback active
- if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): has PLAYBACK_TYPE_REMOTE");
- return true;
- }
- if (AudioSystem.isStreamActiveRemotely(AudioSystem.STREAM_MUSIC, 0)) {
- // remote submix playback active
- if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): remote submix");
- return true;
- }
- if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): no");
- return false;
- }
-
/** @see AudioManager#adjustVolume(int, int) */
public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,
String callingPackage) {
@@ -930,9 +906,8 @@
}
final int resolvedStream = mStreamVolumeAlias[streamType];
- // Play sounds on STREAM_RING and STREAM_REMOTE_MUSIC only.
- if ((streamType != STREAM_REMOTE_MUSIC) &&
- (flags & AudioManager.FLAG_PLAY_SOUND) != 0 &&
+ // Play sounds on STREAM_RING only.
+ if ((flags & AudioManager.FLAG_PLAY_SOUND) != 0 &&
resolvedStream != AudioSystem.STREAM_RING) {
flags &= ~AudioManager.FLAG_PLAY_SOUND;
}
@@ -945,17 +920,17 @@
if (DEBUG_VOL) Log.d(TAG, "Volume controller suppressed adjustment");
}
- if (streamType == STREAM_REMOTE_MUSIC) {
- // TODO bounce it to MediaSessionService to find an appropriate
- // session
- } else {
- adjustStreamVolume(streamType, direction, flags, callingPackage);
- }
+ adjustStreamVolume(streamType, direction, flags, callingPackage);
}
/** @see AudioManager#adjustStreamVolume(int, int, int) */
public void adjustStreamVolume(int streamType, int direction, int flags,
String callingPackage) {
+ adjustStreamVolume(streamType, direction, flags, callingPackage, Binder.getCallingUid());
+ }
+
+ private void adjustStreamVolume(int streamType, int direction, int flags,
+ String callingPackage, int uid) {
if (mUseFixedVolume) {
return;
}
@@ -984,8 +959,8 @@
return;
}
- if (mAppOps.noteOp(STEAM_VOLUME_OPS[streamTypeAlias], Binder.getCallingUid(),
- callingPackage) != AppOpsManager.MODE_ALLOWED) {
+ if (mAppOps.noteOp(STEAM_VOLUME_OPS[streamTypeAlias], uid, callingPackage)
+ != AppOpsManager.MODE_ALLOWED) {
return;
}
@@ -1161,6 +1136,11 @@
/** @see AudioManager#setStreamVolume(int, int, int) */
public void setStreamVolume(int streamType, int index, int flags, String callingPackage) {
+ setStreamVolume(streamType, index, flags, callingPackage, Binder.getCallingUid());
+ }
+
+ private void setStreamVolume(int streamType, int index, int flags, String callingPackage,
+ int uid) {
if (mUseFixedVolume) {
return;
}
@@ -1179,8 +1159,8 @@
return;
}
- if (mAppOps.noteOp(STEAM_VOLUME_OPS[streamTypeAlias], Binder.getCallingUid(),
- callingPackage) != AppOpsManager.MODE_ALLOWED) {
+ if (mAppOps.noteOp(STEAM_VOLUME_OPS[streamTypeAlias], uid, callingPackage)
+ != AppOpsManager.MODE_ALLOWED) {
return;
}
@@ -1885,10 +1865,6 @@
}
}
int streamType = getActiveStreamType(AudioManager.USE_DEFAULT_STREAM_TYPE);
- if (streamType == STREAM_REMOTE_MUSIC) {
- // here handle remote media playback the same way as local playback
- streamType = AudioManager.STREAM_MUSIC;
- }
int device = getDeviceForStream(streamType);
int index = mStreamStates[mStreamVolumeAlias[streamType]].getIndex(device);
setStreamVolumeInt(mStreamVolumeAlias[streamType], index, device, true);
@@ -2973,12 +2949,6 @@
if (DEBUG_VOL)
Log.v(TAG, "getActiveStreamType: Forcing STREAM_MUSIC stream active");
return AudioSystem.STREAM_MUSIC;
- } else
- if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC))
- {
- if (DEBUG_VOL)
- Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
- return STREAM_REMOTE_MUSIC;
} else {
if (DEBUG_VOL)
Log.v(TAG, "getActiveStreamType: Forcing STREAM_RING b/c default");
@@ -2992,19 +2962,8 @@
break;
case PLATFORM_TELEVISION:
if (suggestedStreamType == AudioManager.USE_DEFAULT_STREAM_TYPE) {
- if (isAfMusicActiveRecently(DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS)) {
- if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: forcing STREAM_MUSIC");
+ // TV always defaults to STREAM_MUSIC
return AudioSystem.STREAM_MUSIC;
- } else if (mMediaFocusControl.checkUpdateRemoteStateIfActive(
- AudioSystem.STREAM_MUSIC)) {
- if (DEBUG_VOL)
- Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
- return STREAM_REMOTE_MUSIC;
- } else {
- if (DEBUG_VOL) Log.v(TAG,
- "getActiveStreamType: using STREAM_MUSIC as default");
- return AudioSystem.STREAM_MUSIC;
- }
}
break;
default:
@@ -3027,12 +2986,6 @@
if (isAfMusicActiveRecently(DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS)) {
if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: forcing STREAM_MUSIC");
return AudioSystem.STREAM_MUSIC;
- } else
- if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC))
- {
- if (DEBUG_VOL)
- Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
- return STREAM_REMOTE_MUSIC;
} else {
if (DEBUG_VOL) Log.v(TAG,
"getActiveStreamType: using STREAM_NOTIFICATION as default");
@@ -4618,8 +4571,8 @@
// in SettingsObserver. Here we should log that a USB device is connected
// and disconnected with its address (card , device) and force the
// connection or disconnection when the setting changes.
- int isDisabled = Settings.System.getInt(mContentResolver,
- Settings.System.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0);
+ int isDisabled = Settings.Secure.getInt(mContentResolver,
+ Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0);
if (isDisabled != 0) {
return;
}
@@ -5347,6 +5300,24 @@
}
}
+ /**
+ * Interface for system components to get some extra functionality through
+ * LocalServices.
+ */
+ final class AudioServiceInternal extends AudioManagerInternal {
+ @Override
+ public void adjustStreamVolumeForUid(int streamType, int direction, int flags,
+ String callingPackage, int uid) {
+ adjustStreamVolume(streamType, direction, flags, callingPackage, uid);
+ }
+
+ @Override
+ public void setStreamVolumeForUid(int streamType, int direction, int flags,
+ String callingPackage, int uid) {
+ setStreamVolume(streamType, direction, flags, callingPackage, uid);
+ }
+ }
+
//==========================================================================================
// Audio policy management
//==========================================================================================
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 8bc2498..1861bd7 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -92,7 +92,10 @@
/** Minimum value for sample rate */
private static final int SAMPLE_RATE_HZ_MIN = 4000;
/** Maximum value for sample rate */
- private static final int SAMPLE_RATE_HZ_MAX = 48000;
+ private static final int SAMPLE_RATE_HZ_MAX = 96000;
+
+ /** Maximum value for AudioTrack channel count */
+ private static final int CHANNEL_COUNT_MAX = 8;
/** indicates AudioTrack state is stopped */
public static final int PLAYSTATE_STOPPED = 1; // matches SL_PLAYSTATE_STOPPED
@@ -465,7 +468,9 @@
AudioFormat.CHANNEL_OUT_LOW_FREQUENCY |
AudioFormat.CHANNEL_OUT_BACK_LEFT |
AudioFormat.CHANNEL_OUT_BACK_RIGHT |
- AudioFormat.CHANNEL_OUT_BACK_CENTER;
+ AudioFormat.CHANNEL_OUT_BACK_CENTER |
+ AudioFormat.CHANNEL_OUT_SIDE_LEFT |
+ AudioFormat.CHANNEL_OUT_SIDE_RIGHT;
// Convenience method for the constructor's parameter checks.
// This is where constructor IllegalArgumentException-s are thrown
@@ -541,6 +546,12 @@
loge("Channel configuration features unsupported channels");
return false;
}
+ final int channelCount = Integer.bitCount(channelConfig);
+ if (channelCount > CHANNEL_COUNT_MAX) {
+ loge("Channel configuration contains too many channels " +
+ channelCount + ">" + CHANNEL_COUNT_MAX);
+ return false;
+ }
// check for unsupported multichannel combinations:
// - FL/FR must be present
// - L/R channels must be paired (e.g. no single L channel)
@@ -558,6 +569,13 @@
return false;
}
}
+ final int sidePair =
+ AudioFormat.CHANNEL_OUT_SIDE_LEFT | AudioFormat.CHANNEL_OUT_SIDE_RIGHT;
+ if ((channelConfig & sidePair) != 0
+ && (channelConfig & sidePair) != sidePair) {
+ loge("Side channels can't be used independently");
+ return false;
+ }
return true;
}
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index 7318660..6477055 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -37,8 +37,6 @@
*/
interface IAudioService {
- boolean isLocalOrRemoteMusicActive();
-
void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,
String callingPackage);
diff --git a/media/java/android/media/IRingtonePlayer.aidl b/media/java/android/media/IRingtonePlayer.aidl
index 0872f1d..7c011e6 100644
--- a/media/java/android/media/IRingtonePlayer.aidl
+++ b/media/java/android/media/IRingtonePlayer.aidl
@@ -16,6 +16,7 @@
package android.media;
+import android.media.AudioAttributes;
import android.net.Uri;
import android.os.UserHandle;
@@ -24,11 +25,11 @@
*/
interface IRingtonePlayer {
/** Used for Ringtone.java playback */
- void play(IBinder token, in Uri uri, int streamType);
+ void play(IBinder token, in Uri uri, in AudioAttributes aa);
void stop(IBinder token);
boolean isPlaying(IBinder token);
/** Used for Notification sound playback. */
- void playAsync(in Uri uri, in UserHandle user, boolean looping, int streamType);
+ void playAsync(in Uri uri, in UserHandle user, boolean looping, in AudioAttributes aa);
void stopAsync();
}
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index b6e03f5..ae2d024 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -450,10 +450,16 @@
}
private void applyLevelLimits() {
- if (mParent.getMime().equalsIgnoreCase(
- MediaFormat.MIMETYPE_AUDIO_FLAC)) {
+ String mime = mParent.getMime();
+ if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_FLAC)) {
mComplexityRange = Range.create(0, 8);
mBitControl = (1 << BITRATE_MODE_CQ);
+ } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_AMR_NB)
+ || mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_AMR_WB)
+ || mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_G711_ALAW)
+ || mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_G711_MLAW)
+ || mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_MSGSM)) {
+ mBitControl = (1 << BITRATE_MODE_CBR);
}
}
@@ -514,11 +520,12 @@
/** @hide */
public void setDefaultFormat(MediaFormat format) {
- if (mQualityRange.getUpper() != mQualityRange.getLower()
+ // don't list trivial quality/complexity as default for now
+ if (!mQualityRange.getUpper().equals(mQualityRange.getLower())
&& mDefaultQuality != null) {
format.setInteger(MediaFormat.KEY_QUALITY, mDefaultQuality);
}
- if (mComplexityRange.getUpper() != mComplexityRange.getLower()
+ if (!mComplexityRange.getUpper().equals(mComplexityRange.getLower())
&& mDefaultComplexity != null) {
format.setInteger(MediaFormat.KEY_COMPLEXITY, mDefaultComplexity);
}
@@ -985,34 +992,34 @@
if ((mParent.mError & ERROR_UNSUPPORTED) != 0) {
// codec supports profiles that we don't know.
- // Extend ranges clipped to platform limits.
+ // Use supplied values clipped to platform limits
if (widths != null) {
- mWidthRange = mWidthRange.extend(widths);
+ mWidthRange = SIZE_RANGE.intersect(widths);
}
if (heights != null) {
- mHeightRange = mHeightRange.extend(heights);
+ mHeightRange = SIZE_RANGE.intersect(heights);
}
if (counts != null) {
- mBlockCountRange = mBlockCountRange.extend(
+ mBlockCountRange = POSITIVE_INTEGERS.intersect(
Utils.factorRange(counts, mBlockWidth * mBlockHeight
/ blockSize.getWidth() / blockSize.getHeight()));
}
if (blockRates != null) {
- mBlocksPerSecondRange = mBlocksPerSecondRange.extend(
+ mBlocksPerSecondRange = POSITIVE_LONGS.intersect(
Utils.factorRange(blockRates, mBlockWidth * mBlockHeight
/ blockSize.getWidth() / blockSize.getHeight()));
}
if (blockRatios != null) {
- mBlockAspectRatioRange = mBlockAspectRatioRange.extend(
+ mBlockAspectRatioRange = POSITIVE_RATIONALS.intersect(
Utils.scaleRange(blockRatios,
mBlockHeight / blockSize.getHeight(),
mBlockWidth / blockSize.getWidth()));
}
if (ratios != null) {
- mAspectRatioRange = mAspectRatioRange.extend(ratios);
+ mAspectRatioRange = POSITIVE_RATIONALS.intersect(ratios);
}
if (frameRates != null) {
- mFrameRateRange = mFrameRateRange.extend(frameRates);
+ mFrameRateRange = FRAME_RATE_RANGE.intersect(frameRates);
}
} else {
// no unsupported profile/levels, so restrict values to known limits
@@ -1235,7 +1242,6 @@
Log.w(TAG, "Unrecognized level "
+ profileLevel.level + " for " + mime);
errors |= ERROR_UNRECOGNIZED;
- supported = false;
}
switch (profileLevel.profile) {
case CodecProfileLevel.AVCProfileHigh:
@@ -1245,7 +1251,7 @@
case CodecProfileLevel.AVCProfileExtended:
case CodecProfileLevel.AVCProfileHigh422:
case CodecProfileLevel.AVCProfileHigh444:
- Log.w(TAG, "Unrecognized profile "
+ Log.w(TAG, "Unsupported profile "
+ profileLevel.profile + " for " + mime);
errors |= ERROR_UNSUPPORTED;
supported = false;
@@ -1271,7 +1277,9 @@
int maxLengthInBlocks = (int)(Math.sqrt(maxBlocks * 8));
applyMacroBlockLimits(
maxLengthInBlocks, maxLengthInBlocks,
- maxBlocks, maxBlocksPerSecond, 16, 16, 1, 1);
+ maxBlocks, maxBlocksPerSecond,
+ 16 /* blockWidth */, 16 /* blockHeight */,
+ 1 /* widthAlignment */, 1 /* heightAlignment */);
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_MPEG4)) {
int maxWidth = 11, maxHeight = 9, maxRate = 15;
maxBlocks = 99;
@@ -1369,7 +1377,9 @@
maxRate = Math.max(FR, maxRate);
}
applyMacroBlockLimits(maxWidth, maxHeight,
- maxBlocks, maxBlocksPerSecond, 16, 16, 1, 1);
+ maxBlocks, maxBlocksPerSecond,
+ 16 /* blockWidth */, 16 /* blockHeight */,
+ 1 /* widthAlignment */, 1 /* heightAlignment */);
mFrameRateRange = mFrameRateRange.intersect(12, maxRate);
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_H263)) {
int maxWidth = 11, maxHeight = 9, maxRate = 15;
@@ -1432,7 +1442,9 @@
maxRate = Math.max(FR, maxRate);
}
applyMacroBlockLimits(maxWidth, maxHeight,
- maxBlocks, maxBlocksPerSecond, 16, 16, 1, 1);
+ maxBlocks, maxBlocksPerSecond,
+ 16 /* blockWidth */, 16 /* blockHeight */,
+ 1 /* widthAlignment */, 1 /* heightAlignment */);
mFrameRateRange = Range.create(1, maxRate);
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_VP8) ||
mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_VP9)) {
@@ -1465,6 +1477,12 @@
}
errors &= ~ERROR_NONE_SUPPORTED;
}
+
+ final int blockSize =
+ mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_VP8) ? 16 : 8;
+ applyMacroBlockLimits(Short.MAX_VALUE, Short.MAX_VALUE,
+ maxBlocks, maxBlocksPerSecond, blockSize, blockSize,
+ 1 /* widthAlignment */, 1 /* heightAlignment */);
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC)) {
maxBlocks = 36864;
maxBlocksPerSecond = maxBlocks * 15;
@@ -1493,17 +1511,17 @@
FR = 30; FS = 2228224; BR = 12000; break;
case CodecProfileLevel.HEVCHighTierLevel4:
FR = 30; FS = 2228224; BR = 30000; break;
- case CodecProfileLevel.HEVCHighTierLevel41:
- FR = 60; FS = 2228224; BR = 20000; break;
case CodecProfileLevel.HEVCMainTierLevel41:
+ FR = 60; FS = 2228224; BR = 20000; break;
+ case CodecProfileLevel.HEVCHighTierLevel41:
FR = 60; FS = 2228224; BR = 50000; break;
- case CodecProfileLevel.HEVCHighTierLevel5:
- FR = 30; FS = 8912896; BR = 25000; break;
case CodecProfileLevel.HEVCMainTierLevel5:
+ FR = 30; FS = 8912896; BR = 25000; break;
+ case CodecProfileLevel.HEVCHighTierLevel5:
FR = 30; FS = 8912896; BR = 100000; break;
- case CodecProfileLevel.HEVCHighTierLevel51:
- FR = 60; FS = 8912896; BR = 40000; break;
case CodecProfileLevel.HEVCMainTierLevel51:
+ FR = 60; FS = 8912896; BR = 40000; break;
+ case CodecProfileLevel.HEVCHighTierLevel51:
FR = 60; FS = 8912896; BR = 160000; break;
case CodecProfileLevel.HEVCMainTierLevel52:
FR = 120; FS = 8912896; BR = 60000; break;
@@ -1513,13 +1531,13 @@
FR = 30; FS = 35651584; BR = 60000; break;
case CodecProfileLevel.HEVCHighTierLevel6:
FR = 30; FS = 35651584; BR = 240000; break;
- case CodecProfileLevel.HEVCHighTierLevel61:
- FR = 60; FS = 35651584; BR = 120000; break;
case CodecProfileLevel.HEVCMainTierLevel61:
+ FR = 60; FS = 35651584; BR = 120000; break;
+ case CodecProfileLevel.HEVCHighTierLevel61:
FR = 60; FS = 35651584; BR = 480000; break;
- case CodecProfileLevel.HEVCHighTierLevel62:
- FR = 120; FS = 35651584; BR = 240000; break;
case CodecProfileLevel.HEVCMainTierLevel62:
+ FR = 120; FS = 35651584; BR = 240000; break;
+ case CodecProfileLevel.HEVCHighTierLevel62:
FR = 120; FS = 35651584; BR = 800000; break;
default:
Log.w(TAG, "Unrecognized level "
@@ -1557,9 +1575,13 @@
applyMacroBlockLimits(
maxLengthInBlocks, maxLengthInBlocks,
- maxBlocks, maxBlocksPerSecond, 8, 8, 1, 1);
+ maxBlocks, maxBlocksPerSecond,
+ 8 /* blockWidth */, 8 /* blockHeight */,
+ 1 /* widthAlignment */, 1 /* heightAlignment */);
} else {
Log.w(TAG, "Unsupported mime " + mime);
+ // using minimal bitrate here. should be overriden by
+ // info from media_codecs.xml
maxBps = 64000;
errors |= ERROR_UNSUPPORTED;
}
@@ -1628,21 +1650,26 @@
if (mMime.toLowerCase().startsWith("audio/")) {
mAudioCaps = AudioCapabilities.create(info, this);
+ mAudioCaps.setDefaultFormat(mDefaultFormat);
} else if (mMime.toLowerCase().startsWith("video/")) {
mVideoCaps = VideoCapabilities.create(info, this);
}
if (encoder) {
mEncoderCaps = EncoderCapabilities.create(info, this);
+ mEncoderCaps.setDefaultFormat(mDefaultFormat);
}
for (Feature feat: getValidFeatures()) {
- Integer yesNo = (Integer)map.get(MediaFormat.KEY_FEATURE_ + feat.mName);
+ String key = MediaFormat.KEY_FEATURE_ + feat.mName;
+ Integer yesNo = (Integer)map.get(key);
if (yesNo == null) {
continue;
} else if (yesNo > 0) {
mFlagsRequired |= feat.mValue;
+ mDefaultFormat.setInteger(key, 1);
} else {
mFlagsSupported |= feat.mValue;
+ mDefaultFormat.setInteger(key, 1);
}
// TODO restrict features by mFlagsVerified once all codecs reliably verify them
}
@@ -1652,10 +1679,14 @@
* A class that supports querying the audio capabilities of a codec.
*/
public static final class AudioCapabilities extends BaseCapabilities {
+ private static final String TAG = "AudioCapabilities";
+
private int[] mSampleRates;
private Range<Integer>[] mSampleRateRanges;
private int mMaxInputChannelCount;
+ private static final int MAX_INPUT_CHANNEL_COUNT = 30;
+
/**
* Returns the array of supported sample rates if the codec
* supports only discrete values. Otherwise, it returns
@@ -1702,7 +1733,7 @@
}
private void initWithPlatformLimits() {
- mMaxInputChannelCount = 30;
+ mMaxInputChannelCount = MAX_INPUT_CHANNEL_COUNT;
// mBitrateRange = Range.create(1, 320000);
mSampleRateRanges = new Range[] { Range.create(8000, 96000) };
mSampleRates = null;
@@ -1758,7 +1789,7 @@
// check if all values are discrete
for (Range<Integer> range: mSampleRateRanges) {
- if (range.getLower() != range.getUpper()) {
+ if (!range.getLower().equals(range.getUpper())) {
mSampleRates = null;
return;
}
@@ -1777,7 +1808,7 @@
8000, 11025, 12000,
16000, 22050, 24000,
32000, 44100, 48000 };
- bitRates = Range.create(8192, 327680);
+ bitRates = Range.create(8000, 320000);
maxChannels = 2;
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_AMR_NB)) {
sampleRates = new int[] { 8000 };
@@ -1807,11 +1838,23 @@
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_RAW)) {
sampleRateRange = Range.create(1, 96000);
bitRates = Range.create(1, 10000000);
- maxChannels = 6;
+ maxChannels = 8;
} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_FLAC)) {
sampleRateRange = Range.create(1, 655350);
// lossless codec, so bitrate is ignored
maxChannels = 255;
+ } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_G711_ALAW)
+ || mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_G711_MLAW)) {
+ sampleRates = new int[] { 8000 };
+ bitRates = Range.create(64000, 64000);
+ // platform allows multiple channels for this format
+ } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_MSGSM)) {
+ sampleRates = new int[] { 8000 };
+ bitRates = Range.create(13000, 13000);
+ maxChannels = 1;
+ } else {
+ Log.w(TAG, "Unsupported mime " + mime);
+ mParent.mError |= ERROR_UNSUPPORTED;
}
// restrict ranges
@@ -1832,7 +1875,7 @@
}
private void parseFromInfo(MediaFormat info) {
- int maxInputChannels = 1;
+ int maxInputChannels = MAX_INPUT_CHANNEL_COUNT;
Range<Integer> bitRates = POSITIVE_INTEGERS;
if (info.containsKey("sample-rate-ranges")) {
@@ -1844,7 +1887,8 @@
limitSampleRates(rateRanges);
}
if (info.containsKey("max-channel-count")) {
- maxInputChannels = info.getInteger("max-channel-count");
+ maxInputChannels = Utils.parseIntSafely(
+ info.getString("max-channel-count"), maxInputChannels);
}
if (info.containsKey("bitrate-range")) {
bitRates = bitRates.intersect(
@@ -1854,6 +1898,21 @@
}
/** @hide */
+ public void setDefaultFormat(MediaFormat format) {
+ // report settings that have only a single choice
+ if (mBitrateRange.getLower().equals(mBitrateRange.getUpper())) {
+ format.setInteger(MediaFormat.KEY_BIT_RATE, mBitrateRange.getLower());
+ }
+ if (mMaxInputChannelCount == 1) {
+ // mono-only format
+ format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, 1);
+ }
+ if (mSampleRates != null && mSampleRates.length == 1) {
+ format.setInteger(MediaFormat.KEY_SAMPLE_RATE, mSampleRates[0]);
+ }
+ }
+
+ /** @hide */
public boolean supportsFormat(MediaFormat format) {
Map<String, Object> map = format.getMap();
Integer sampleRate = (Integer)map.get(MediaFormat.KEY_SAMPLE_RATE);
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 2fa0c93..7c3b4fc 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1049,8 +1049,17 @@
private void setDataSource(String path, String[] keys, String[] values)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
final Uri uri = Uri.parse(path);
- if ("file".equals(uri.getScheme())) {
+ final String scheme = uri.getScheme();
+ if ("file".equals(scheme)) {
path = uri.getPath();
+ } else if (scheme != null) {
+ // handle non-file sources
+ nativeSetDataSource(
+ MediaHTTPService.createHttpServiceBinderIfNecessary(path),
+ path,
+ keys,
+ values);
+ return;
}
final File file = new File(path);
@@ -1060,20 +1069,10 @@
setDataSource(fd);
is.close();
} else {
- _setDataSource(path, keys, values);
+ throw new IOException("setDataSource failed.");
}
}
- private void _setDataSource(
- String path, String[] keys, String[] values)
- throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
- nativeSetDataSource(
- MediaHTTPService.createHttpServiceBinderIfNecessary(path),
- path,
- keys,
- values);
- }
-
private native void nativeSetDataSource(
IBinder httpServiceBinder, String path, String[] keys, String[] values)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException;
diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java
index 0aaaf46..f378cef 100644
--- a/media/java/android/media/RemoteController.java
+++ b/media/java/android/media/RemoteController.java
@@ -74,7 +74,7 @@
private MetadataEditor mMetadataEditor;
private MediaSessionManager mSessionManager;
- private MediaSessionManager.SessionListener mSessionListener;
+ private MediaSessionManager.OnActiveSessionsChangedListener mSessionListener;
private MediaController.Callback mSessionCb = new MediaControllerCallback();
/**
@@ -140,7 +140,7 @@
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mSessionManager = (MediaSessionManager) context
.getSystemService(Context.MEDIA_SESSION_SERVICE);
- mSessionListener = new TopTransportSessionListener(context);
+ mSessionListener = new TopTransportSessionListener();
if (ActivityManager.isLowRamDeviceStatic()) {
mMaxBitmapDimension = MAX_BITMAP_DIMENSION;
@@ -710,11 +710,8 @@
* Listens for changes to the active session stack and replaces the
* currently tracked session if it has changed.
*/
- private class TopTransportSessionListener extends MediaSessionManager.SessionListener {
-
- public TopTransportSessionListener(Context context) {
- super(context);
- }
+ private class TopTransportSessionListener implements
+ MediaSessionManager.OnActiveSessionsChangedListener {
@Override
public void onActiveSessionsChanged(List<MediaController> controllers) {
@@ -792,8 +789,8 @@
void startListeningToSessions() {
final ComponentName listenerComponent = new ComponentName(mContext,
mOnClientUpdateListener.getClass());
- mSessionManager.addActiveSessionsListener(mSessionListener, listenerComponent,
- UserHandle.myUserId());
+ mSessionManager.addOnActiveSessionsChangedListener(mSessionListener, listenerComponent,
+ UserHandle.myUserId(), null);
mSessionListener.onActiveSessionsChanged(mSessionManager
.getActiveSessions(listenerComponent));
if (DEBUG) {
@@ -806,7 +803,7 @@
* @hide
*/
void stopListeningToSessions() {
- mSessionManager.removeActiveSessionsListener(mSessionListener);
+ mSessionManager.removeOnActiveSessionsChangedListener(mSessionListener);
if (DEBUG) {
Log.d(TAG, "Unregistered session listener for user "
+ UserHandle.myUserId());
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index 2616b6c..a221104 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -60,7 +60,10 @@
private Uri mUri;
private String mTitle;
- private int mStreamType = AudioManager.STREAM_RING;
+ private AudioAttributes mAudioAttributes = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+ .build();
/** {@hide} */
public Ringtone(Context context, boolean allowRemote) {
@@ -75,22 +78,40 @@
* Sets the stream type where this ringtone will be played.
*
* @param streamType The stream, see {@link AudioManager}.
+ * @deprecated use {@link #setAudioAttributes(AudioAttributes)}
*/
+ @Deprecated
public void setStreamType(int streamType) {
- mStreamType = streamType;
-
- // The stream type has to be set before the media player is prepared.
- // Re-initialize it.
- setUri(mUri);
+ setAudioAttributes(new AudioAttributes.Builder()
+ .setInternalLegacyStreamType(streamType)
+ .build());
}
/**
* Gets the stream type where this ringtone will be played.
*
* @return The stream type, see {@link AudioManager}.
+ * @deprecated use of stream types is deprecated, see
+ * {@link #setAudioAttributes(AudioAttributes)}
*/
+ @Deprecated
public int getStreamType() {
- return mStreamType;
+ return AudioAttributes.toLegacyStreamType(mAudioAttributes);
+ }
+
+ /**
+ * Sets the {@link AudioAttributes} for this ringtone.
+ * @param attributes the non-null attributes characterizing this ringtone.
+ */
+ public void setAudioAttributes(AudioAttributes attributes)
+ throws IllegalArgumentException {
+ if (attributes == null) {
+ throw new IllegalArgumentException("Invalid null AudioAttributes for Ringtone");
+ }
+ mAudioAttributes = attributes;
+ // The audio attributes have to be set before the media player is prepared.
+ // Re-initialize it.
+ setUri(mUri);
}
/**
@@ -178,7 +199,7 @@
mLocalPlayer = new MediaPlayer();
try {
mLocalPlayer.setDataSource(mContext, mUri);
- mLocalPlayer.setAudioStreamType(mStreamType);
+ mLocalPlayer.setAudioAttributes(mAudioAttributes);
mLocalPlayer.prepare();
} catch (SecurityException e) {
@@ -214,13 +235,14 @@
if (mLocalPlayer != null) {
// do not play ringtones if stream volume is 0
// (typically because ringer mode is silent).
- if (mAudioManager.getStreamVolume(mStreamType) != 0) {
+ if (mAudioManager.getStreamVolume(
+ AudioAttributes.toLegacyStreamType(mAudioAttributes)) != 0) {
mLocalPlayer.start();
}
} else if (mAllowRemote && (mRemotePlayer != null)) {
final Uri canonicalUri = mUri.getCanonicalUri();
try {
- mRemotePlayer.play(mRemoteToken, canonicalUri, mStreamType);
+ mRemotePlayer.play(mRemoteToken, canonicalUri, mAudioAttributes);
} catch (RemoteException e) {
if (!playFallbackRingtone()) {
Log.w(TAG, "Problem playing ringtone: " + e);
@@ -278,7 +300,8 @@
}
private boolean playFallbackRingtone() {
- if (mAudioManager.getStreamVolume(mStreamType) != 0) {
+ if (mAudioManager.getStreamVolume(AudioAttributes.toLegacyStreamType(mAudioAttributes))
+ != 0) {
int ringtoneType = RingtoneManager.getDefaultType(mUri);
if (ringtoneType == -1 ||
RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType) != null) {
@@ -295,7 +318,7 @@
afd.getStartOffset(),
afd.getDeclaredLength());
}
- mLocalPlayer.setAudioStreamType(mStreamType);
+ mLocalPlayer.setAudioAttributes(mAudioAttributes);
mLocalPlayer.prepare();
mLocalPlayer.start();
afd.close();
diff --git a/media/java/android/media/Utils.java b/media/java/android/media/Utils.java
index 12910ec..df0daaf 100644
--- a/media/java/android/media/Utils.java
+++ b/media/java/android/media/Utils.java
@@ -210,6 +210,19 @@
return fallback;
}
+ static int parseIntSafely(Object o, int fallback) {
+ try {
+ String s = (String)o;
+ return Integer.parseInt(s);
+ } catch (ClassCastException e) {
+ } catch (NumberFormatException e) {
+ } catch (NullPointerException e) {
+ return fallback;
+ }
+ Log.w(TAG, "could not parse integer '" + o + "'");
+ return fallback;
+ }
+
static Range<Integer> parseIntRange(Object o, Range<Integer> fallback) {
try {
String s = (String)o;
diff --git a/media/java/android/media/projection/IMediaProjectionManager.aidl b/media/java/android/media/projection/IMediaProjectionManager.aidl
index 6ed803a..7e10c51 100644
--- a/media/java/android/media/projection/IMediaProjectionManager.aidl
+++ b/media/java/android/media/projection/IMediaProjectionManager.aidl
@@ -17,6 +17,9 @@
package android.media.projection;
import android.media.projection.IMediaProjection;
+import android.media.projection.IMediaProjectionCallback;
+import android.media.projection.IMediaProjectionWatcherCallback;
+import android.media.projection.MediaProjectionInfo;
import android.os.IBinder;
/** {@hide} */
@@ -25,4 +28,8 @@
IMediaProjection createProjection(int uid, String packageName, int type,
boolean permanentGrant);
boolean isValidMediaProjection(IMediaProjection projection);
+ MediaProjectionInfo getActiveProjectionInfo();
+ void stopActiveProjection();
+ void addCallback(IMediaProjectionWatcherCallback callback);
+ void removeCallback(IMediaProjectionWatcherCallback callback);
}
diff --git a/core/java/android/content/pm/PackageInstallerParams.aidl b/media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl
similarity index 70%
copy from core/java/android/content/pm/PackageInstallerParams.aidl
copy to media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl
index b3dde21..2231ce1 100644
--- a/core/java/android/content/pm/PackageInstallerParams.aidl
+++ b/media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl
@@ -14,6 +14,12 @@
* limitations under the License.
*/
-package android.content.pm;
+package android.media.projection;
-parcelable PackageInstallerParams;
+import android.media.projection.MediaProjectionInfo;
+
+/** {@hide} */
+oneway interface IMediaProjectionWatcherCallback {
+ void onStart(in MediaProjectionInfo info);
+ void onStop(in MediaProjectionInfo info);
+}
diff --git a/media/java/android/media/projection/MediaProjection.java b/media/java/android/media/projection/MediaProjection.java
index 861039d..99d3ceb 100644
--- a/media/java/android/media/projection/MediaProjection.java
+++ b/media/java/android/media/projection/MediaProjection.java
@@ -139,6 +139,7 @@
/**
* Creates an AudioRecord to capture audio played back by the system.
+ * @hide
*/
public AudioRecord createAudioRecord(
int sampleRateInHz, int channelConfig,
diff --git a/core/java/android/app/AlarmClockInfo.aidl b/media/java/android/media/projection/MediaProjectionInfo.aidl
similarity index 89%
copy from core/java/android/app/AlarmClockInfo.aidl
copy to media/java/android/media/projection/MediaProjectionInfo.aidl
index 58a3644..3c8f9b6 100644
--- a/core/java/android/app/AlarmClockInfo.aidl
+++ b/media/java/android/media/projection/MediaProjectionInfo.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.app;
+package android.media.projection;
-parcelable AlarmClockInfo;
+parcelable MediaProjectionInfo;
diff --git a/media/java/android/media/projection/MediaProjectionInfo.java b/media/java/android/media/projection/MediaProjectionInfo.java
new file mode 100644
index 0000000..7ebc31f
--- /dev/null
+++ b/media/java/android/media/projection/MediaProjectionInfo.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.projection;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.UserHandle;
+
+/** @hide */
+public final class MediaProjectionInfo implements Parcelable {
+ private final String mPackageName;
+ private final UserHandle mUserHandle;
+
+ public MediaProjectionInfo(String packageName, UserHandle handle) {
+ mPackageName = packageName;
+ mUserHandle = handle;
+ }
+
+ public MediaProjectionInfo(Parcel in) {
+ mPackageName = in.readString();
+ mUserHandle = UserHandle.readFromParcel(in);
+ }
+
+ public String getPackageName() {
+ return mPackageName;
+ }
+
+ public UserHandle getUserHandle() {
+ return mUserHandle;
+ }
+
+ @Override
+ public String toString() {
+ return "MediaProjectionInfo{mPackageName="
+ + mPackageName + ", mUserHandle="
+ + mUserHandle + "}";
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeString(mPackageName);
+ UserHandle.writeToParcel(mUserHandle, out);
+ }
+
+ public static final Parcelable.Creator<MediaProjectionInfo> CREATOR =
+ new Parcelable.Creator<MediaProjectionInfo>() {
+ @Override
+ public MediaProjectionInfo createFromParcel(Parcel in) {
+ return new MediaProjectionInfo (in);
+ }
+
+ @Override
+ public MediaProjectionInfo[] newArray(int size) {
+ return new MediaProjectionInfo[size];
+ }
+ };
+}
diff --git a/media/java/android/media/projection/MediaProjectionManager.java b/media/java/android/media/projection/MediaProjectionManager.java
index aac8cf9..50d66c6 100644
--- a/media/java/android/media/projection/MediaProjectionManager.java
+++ b/media/java/android/media/projection/MediaProjectionManager.java
@@ -17,12 +17,20 @@
package android.media.projection;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.media.projection.IMediaProjection;
import android.os.Binder;
+import android.os.Handler;
import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.util.Map;
/**
* Manages the retrieval of certain types of {@link MediaProjection} tokens.
@@ -35,6 +43,7 @@
* </p>
*/
public final class MediaProjectionManager {
+ private static final String TAG = "MediaProjectionManager";
/** @hide */
public static final String EXTRA_APP_TOKEN = "android.media.projection.extra.EXTRA_APP_TOKEN";
/** @hide */
@@ -49,10 +58,15 @@
public static final int TYPE_PRESENTATION = 2;
private Context mContext;
+ private Map<Callback, CallbackDelegate> mCallbacks;
+ private IMediaProjectionManager mService;
/** @hide */
public MediaProjectionManager(Context context) {
mContext = context;
+ IBinder b = ServiceManager.getService(Context.MEDIA_PROJECTION_SERVICE);
+ mService = IMediaProjectionManager.Stub.asInterface(b);
+ mCallbacks = new ArrayMap<>();
}
/**
@@ -88,4 +102,105 @@
}
return new MediaProjection(mContext, IMediaProjection.Stub.asInterface(projection));
}
+
+ /**
+ * Get the {@link MediaProjectionInfo} for the active {@link MediaProjection}.
+ * @hide
+ */
+ public MediaProjectionInfo getActiveProjectionInfo() {
+ try {
+ return mService.getActiveProjectionInfo();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to get the active projection info", e);
+ }
+ return null;
+ }
+
+ /**
+ * Stop the current projection if there is one.
+ * @hide
+ */
+ public void stopActiveProjection() {
+ try {
+ mService.stopActiveProjection();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to stop the currently active media projection", e);
+ }
+ }
+
+ /**
+ * Add a callback to monitor all of the {@link MediaProjection}s activity.
+ * Not for use by regular applications, must have the MANAGE_MEDIA_PROJECTION permission.
+ * @hide
+ */
+ public void addCallback(@NonNull Callback callback, @Nullable Handler handler) {
+ if (callback == null) {
+ throw new IllegalArgumentException("callback must not be null");
+ }
+ CallbackDelegate delegate = new CallbackDelegate(callback, handler);
+ mCallbacks.put(callback, delegate);
+ try {
+ mService.addCallback(delegate);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to add callbacks to MediaProjection service", e);
+ }
+ }
+
+ /**
+ * Remove a MediaProjection monitoring callback.
+ * @hide
+ */
+ public void removeCallback(@NonNull Callback callback) {
+ if (callback == null) {
+ throw new IllegalArgumentException("callback must not be null");
+ }
+ CallbackDelegate delegate = mCallbacks.remove(callback);
+ try {
+ if (delegate != null) {
+ mService.removeCallback(delegate);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to add callbacks to MediaProjection service", e);
+ }
+ }
+
+ /** @hide */
+ public static abstract class Callback {
+ public abstract void onStart(MediaProjectionInfo info);
+ public abstract void onStop(MediaProjectionInfo info);
+ }
+
+ /** @hide */
+ private final static class CallbackDelegate extends IMediaProjectionWatcherCallback.Stub {
+ private Callback mCallback;
+ private Handler mHandler;
+
+ public CallbackDelegate(Callback callback, Handler handler) {
+ mCallback = callback;
+ if (handler == null) {
+ handler = new Handler();
+ }
+ mHandler = handler;
+ }
+
+ @Override
+ public void onStart(final MediaProjectionInfo info) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onStart(info);
+ }
+ });
+ }
+
+ @Override
+ public void onStop(final MediaProjectionInfo info) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onStop(info);
+ }
+ });
+ }
+ }
}
diff --git a/media/java/android/media/routing/IMediaRouteClientCallback.aidl b/media/java/android/media/routing/IMediaRouteClientCallback.aidl
deleted file mode 100644
index d90ea3b..0000000
--- a/media/java/android/media/routing/IMediaRouteClientCallback.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-import android.media.routing.MediaRouteSelector;
-import android.media.routing.ParcelableConnectionInfo;
-import android.media.routing.ParcelableDestinationInfo;
-import android.media.routing.ParcelableRouteInfo;
-import android.os.IBinder;
-import android.os.Bundle;
-
-/**
- * @hide
- */
-oneway interface IMediaRouteClientCallback {
- void onDestinationFound(int seq, in ParcelableDestinationInfo destination,
- in ParcelableRouteInfo[] routes);
-
- void onDestinationLost(int seq, String id);
-
- void onDiscoveryFailed(int seq, int error, in CharSequence message, in Bundle extras);
-
- void onConnected(int seq, in ParcelableConnectionInfo connection);
-
- void onDisconnected(int seq);
-
- void onConnectionFailed(int seq, int error, in CharSequence message, in Bundle extras);
-}
diff --git a/media/java/android/media/routing/IMediaRouteService.aidl b/media/java/android/media/routing/IMediaRouteService.aidl
deleted file mode 100644
index 493ab6d..0000000
--- a/media/java/android/media/routing/IMediaRouteService.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-import android.media.routing.IMediaRouteClientCallback;
-import android.media.routing.MediaRouteSelector;
-import android.os.Bundle;
-
-/**
- * Interface to an app's MediaRouteService.
- * @hide
- */
-oneway interface IMediaRouteService {
- void registerClient(int clientUid, String clientPackageName,
- in IMediaRouteClientCallback callback);
-
- void unregisterClient(in IMediaRouteClientCallback callback);
-
- void startDiscovery(in IMediaRouteClientCallback callback, int seq,
- in List<MediaRouteSelector> selectors, int flags);
-
- void stopDiscovery(in IMediaRouteClientCallback callback);
-
- void connect(in IMediaRouteClientCallback callback, int seq,
- String destinationId, String routeId, int flags, in Bundle extras);
-
- void disconnect(in IMediaRouteClientCallback callback);
-
- void pauseStream(in IMediaRouteClientCallback callback);
-
- void resumeStream(in IMediaRouteClientCallback callback);
-}
-
diff --git a/media/java/android/media/routing/IMediaRouter.aidl b/media/java/android/media/routing/IMediaRouter.aidl
deleted file mode 100644
index 0abb258..0000000
--- a/media/java/android/media/routing/IMediaRouter.aidl
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-/** @hide */
-interface IMediaRouter {
-
-}
-
diff --git a/media/java/android/media/routing/IMediaRouterDelegate.aidl b/media/java/android/media/routing/IMediaRouterDelegate.aidl
deleted file mode 100644
index 35f84c8..0000000
--- a/media/java/android/media/routing/IMediaRouterDelegate.aidl
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-/** @hide */
-interface IMediaRouterDelegate {
-
-}
-
diff --git a/media/java/android/media/routing/IMediaRouterRoutingCallback.aidl b/media/java/android/media/routing/IMediaRouterRoutingCallback.aidl
deleted file mode 100644
index 173ae55..0000000
--- a/media/java/android/media/routing/IMediaRouterRoutingCallback.aidl
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-/** @hide */
-interface IMediaRouterRoutingCallback {
-
-}
-
diff --git a/media/java/android/media/routing/IMediaRouterStateCallback.aidl b/media/java/android/media/routing/IMediaRouterStateCallback.aidl
deleted file mode 100644
index 0299904..0000000
--- a/media/java/android/media/routing/IMediaRouterStateCallback.aidl
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.routing;
-
-/** @hide */
-interface IMediaRouterStateCallback {
-
-}
-
diff --git a/media/java/android/media/routing/MediaRouteSelector.aidl b/media/java/android/media/routing/MediaRouteSelector.aidl
deleted file mode 100644
index 37bfa4a..0000000
--- a/media/java/android/media/routing/MediaRouteSelector.aidl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.media.routing;
-
-parcelable MediaRouteSelector;
diff --git a/media/java/android/media/routing/MediaRouteSelector.java b/media/java/android/media/routing/MediaRouteSelector.java
deleted file mode 100644
index 26a9b1c..0000000
--- a/media/java/android/media/routing/MediaRouteSelector.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.media.routing.MediaRouter.RouteFeatures;
-import android.os.Bundle;
-import android.os.IInterface;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A media route selector consists of a set of constraints that are used to select
- * the routes to which an application would like to connect. The constraints consist
- * of a set of required or optional features and protocols. The constraints may also
- * require the use of a specific media route service package or additional characteristics
- * that are described by a bundle of extra parameters.
- * <p>
- * The application will typically create several different selectors that express
- * various combinations of characteristics that it would like to use together when
- * it connects to a destination media device. For each destination that is discovered,
- * media route services will publish some number of routes and include information
- * about which selector each route matches. The application will then choose among
- * these routes to determine which best satisfies its desired purpose and connect to it.
- * </p>
- */
-public final class MediaRouteSelector implements Parcelable {
- private final int mRequiredFeatures;
- private final int mOptionalFeatures;
- private final List<String> mRequiredProtocols;
- private final List<String> mOptionalProtocols;
- private final String mServicePackageName;
- private final Bundle mExtras;
-
- MediaRouteSelector(int requiredFeatures, int optionalFeatures,
- List<String> requiredProtocols, List<String> optionalProtocols,
- String servicePackageName, Bundle extras) {
- mRequiredFeatures = requiredFeatures;
- mOptionalFeatures = optionalFeatures;
- mRequiredProtocols = requiredProtocols;
- mOptionalProtocols = optionalProtocols;
- mServicePackageName = servicePackageName;
- mExtras = extras;
- }
-
- /**
- * Gets the set of required route features.
- *
- * @return A set of required route feature flags.
- */
- public @RouteFeatures int getRequiredFeatures() {
- return mRequiredFeatures;
- }
-
- /**
- * Gets the set of optional route features.
- *
- * @return A set of optional route feature flags.
- */
- public @RouteFeatures int getOptionalFeatures() {
- return mOptionalFeatures;
- }
-
- /**
- * Gets the list of route protocols that a route must support in order to be selected.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @return The list of fully qualified route protocol names.
- */
- public @NonNull List<String> getRequiredProtocols() {
- return mRequiredProtocols;
- }
-
- /**
- * Gets the list of optional route protocols that a client may use if they are available.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @return The list of optional fully qualified route protocol names.
- */
- public @NonNull List<String> getOptionalProtocols() {
- return mOptionalProtocols;
- }
-
- /**
- * Returns true if the selector includes a required or optional request for
- * the specified protocol using its fully qualified class name.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param clazz The protocol class.
- * @return True if the protocol was requested.
- */
- public boolean containsProtocol(@NonNull Class<?> clazz) {
- return containsProtocol(clazz.getName());
- }
-
- /**
- * Returns true if the selector includes a required or optional request for
- * the specified protocol.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param name The name of the protocol.
- * @return True if the protocol was requested.
- */
- public boolean containsProtocol(@NonNull String name) {
- return mRequiredProtocols.contains(name)
- || mOptionalProtocols.contains(name);
- }
-
- /**
- * Gets the package name of a specific media route service that this route selector
- * requires.
- *
- * @return The required media route service package name, or null if none.
- */
- public @Nullable String getServicePackageName() {
- return mServicePackageName;
- }
-
- /**
- * Gets optional extras that may be used to select or configure routes for a
- * particular purpose. Some extras may be used by media route services to apply
- * additional constraints or parameters for the routes to be discovered.
- *
- * @return The optional extras, or null if none.
- */
- public @Nullable Bundle getExtras() {
- return mExtras;
- }
-
- @Override
- public String toString() {
- return "MediaRouteSelector{ "
- + ", requiredFeatures=0x" + Integer.toHexString(mRequiredFeatures)
- + ", optionalFeatures=0x" + Integer.toHexString(mOptionalFeatures)
- + ", requiredProtocols=" + mRequiredProtocols
- + ", optionalProtocols=" + mOptionalProtocols
- + ", servicePackageName=" + mServicePackageName
- + ", extras=" + mExtras + " }";
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(mRequiredFeatures);
- dest.writeInt(mOptionalFeatures);
- dest.writeStringList(mRequiredProtocols);
- dest.writeStringList(mOptionalProtocols);
- dest.writeString(mServicePackageName);
- dest.writeBundle(mExtras);
- }
-
- public static final Parcelable.Creator<MediaRouteSelector> CREATOR =
- new Parcelable.Creator<MediaRouteSelector>() {
- @Override
- public MediaRouteSelector createFromParcel(Parcel source) {
- int requiredFeatures = source.readInt();
- int optionalFeatures = source.readInt();
- ArrayList<String> requiredProtocols = new ArrayList<String>();
- ArrayList<String> optionalProtocols = new ArrayList<String>();
- source.readStringList(requiredProtocols);
- source.readStringList(optionalProtocols);
- return new MediaRouteSelector(requiredFeatures, optionalFeatures,
- requiredProtocols, optionalProtocols,
- source.readString(), source.readBundle());
- }
-
- @Override
- public MediaRouteSelector[] newArray(int size) {
- return new MediaRouteSelector[size];
- }
- };
-
- /**
- * Builder for {@link MediaRouteSelector} objects.
- */
- public static final class Builder {
- private int mRequiredFeatures;
- private int mOptionalFeatures;
- private final ArrayList<String> mRequiredProtocols = new ArrayList<String>();
- private final ArrayList<String> mOptionalProtocols = new ArrayList<String>();
- private String mServicePackageName;
- private Bundle mExtras;
-
- /**
- * Creates an initially empty selector builder.
- */
- public Builder() {
- }
-
- /**
- * Sets the set of required route features.
- *
- * @param features A set of required route feature flags.
- */
- public @NonNull Builder setRequiredFeatures(@RouteFeatures int features) {
- mRequiredFeatures = features;
- return this;
- }
-
- /**
- * Sets the set of optional route features.
- *
- * @param features A set of optional route feature flags.
- */
- public @NonNull Builder setOptionalFeatures(@RouteFeatures int features) {
- mOptionalFeatures = features;
- return this;
- }
-
- /**
- * Adds a route protocol that a route must support in order to be selected
- * using its fully qualified class name.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param clazz The protocol class.
- * @return this
- */
- public @NonNull Builder addRequiredProtocol(@NonNull Class<?> clazz) {
- if (clazz == null) {
- throw new IllegalArgumentException("clazz must not be null");
- }
- return addRequiredProtocol(clazz.getName());
- }
-
- /**
- * Adds a route protocol that a route must support in order to be selected.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param name The fully qualified name of the required protocol.
- * @return this
- */
- public @NonNull Builder addRequiredProtocol(@NonNull String name) {
- if (TextUtils.isEmpty(name)) {
- throw new IllegalArgumentException("name must not be null or empty");
- }
- mRequiredProtocols.add(name);
- return this;
- }
-
- /**
- * Adds an optional route protocol that a client may use if available
- * using its fully qualified class name.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param clazz The protocol class.
- * @return this
- */
- public @NonNull Builder addOptionalProtocol(@NonNull Class<?> clazz) {
- if (clazz == null) {
- throw new IllegalArgumentException("clazz must not be null");
- }
- return addOptionalProtocol(clazz.getName());
- }
-
- /**
- * Adds an optional route protocol that a client may use if available.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- *
- * @param name The fully qualified name of the optional protocol.
- * @return this
- */
- public @NonNull Builder addOptionalProtocol(@NonNull String name) {
- if (TextUtils.isEmpty(name)) {
- throw new IllegalArgumentException("name must not be null or empty");
- }
- mOptionalProtocols.add(name);
- return this;
- }
-
- /**
- * Sets the package name of the media route service to which this selector
- * appertains.
- * <p>
- * If a package name is specified here then this selector will only be
- * passed to media route services from that package. This has the effect
- * of restricting the set of matching routes to just those that are offered
- * by that package.
- * </p>
- *
- * @param packageName The required service package name, or null if none.
- * @return this
- */
- public @NonNull Builder setServicePackageName(@Nullable String packageName) {
- mServicePackageName = packageName;
- return this;
- }
-
- /**
- * Sets optional extras that may be used to select or configure routes for a
- * particular purpose. Some extras may be used by route services to specify
- * additional constraints or parameters for the routes to be discovered.
- *
- * @param extras The optional extras, or null if none.
- * @return this
- */
- public @NonNull Builder setExtras(@Nullable Bundle extras) {
- mExtras = extras;
- return this;
- }
-
- /**
- * Builds the {@link MediaRouteSelector} object.
- *
- * @return The new media route selector instance.
- */
- public @NonNull MediaRouteSelector build() {
- return new MediaRouteSelector(mRequiredFeatures, mOptionalFeatures,
- mRequiredProtocols, mOptionalProtocols, mServicePackageName, mExtras);
- }
- }
-}
diff --git a/media/java/android/media/routing/MediaRouteService.java b/media/java/android/media/routing/MediaRouteService.java
deleted file mode 100644
index 4d5a8a9..0000000
--- a/media/java/android/media/routing/MediaRouteService.java
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.annotation.SdkConstant;
-import android.app.Service;
-import android.content.Intent;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.media.routing.MediaRouter.ConnectionError;
-import android.media.routing.MediaRouter.ConnectionInfo;
-import android.media.routing.MediaRouter.ConnectionRequest;
-import android.media.routing.MediaRouter.DestinationInfo;
-import android.media.routing.MediaRouter.DiscoveryError;
-import android.media.routing.MediaRouter.DiscoveryRequest;
-import android.media.routing.MediaRouter.RouteInfo;
-import android.media.routing.MediaRouter.ServiceMetadata;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Media route services implement strategies for discovering
- * and establishing connections to media devices and their routes. These services
- * are also known as media route providers.
- * <p>
- * Each media route service subclass is responsible for enabling applications
- * and the system to interact with media devices of some kind.
- * For example, one particular media route service implementation might
- * offer support for discovering nearby wireless display devices and streaming
- * video contents to them; another media route service implementation might
- * offer support for discovering nearby speakers and streaming media appliances
- * and sending commands to play content on request.
- * </p><p>
- * Subclasses must override the {@link #onCreateClientSession} method to return
- * a {@link ClientSession} object that implements the {@link ClientSession#onStartDiscovery},
- * {@link ClientSession#onStopDiscovery}, and {@link ClientSession#onConnect} methods
- * to allow clients to discover and connect to media devices.
- * </p><p>
- * This object is not thread-safe. All callbacks are invoked on the main looper.
- * </p>
- *
- * <h3>Clients</h3>
- * <p>
- * The clients of this API are media applications that would like to discover
- * and connect to media devices. The client may also be the system, such as
- * when the user initiates display mirroring via the Cast Screen function.
- * </p><p>
- * There may be multiple client sessions active at the same time. Each client
- * session can request discovery and connect to routes independently of any
- * other client. It is the responsibility of the media route service to maintain
- * separate state for each client session and to ensure that clients cannot interfere
- * with one another in harmful ways.
- * </p><p>
- * Notwithstanding the requirement to support any number of concurrent client
- * sessions, the media route service may impose constraints on how many clients
- * can connect to the same media device in a particular mode at the same time.
- * In some cases, media devices may support connections from an arbitrary number
- * of clients simultaneously but often it may be necessary to ensure that only
- * one client is in control. When this happens, the media route service should
- * report a connection error unless the connection request specifies that the
- * client should take control of the media device (and forcibly disconnect other
- * clients that may be using it).
- * </p>
- *
- * <h3>Destinations</h3>
- * <p>
- * The media devices to which an application may send media content are referred
- * to in the API as destinations. Each destination therefore represents a single
- * independent device such as a speaker or TV set. Destinations are given meaningful
- * names and descriptions to help the user associate them with devices in their
- * environment.
- * </p><p>
- * Destinations may be local or remote and may be accessed through various means,
- * often wirelessly. The user may install media route services to enable
- * media applications to connect to a variety of destinations with different
- * capabilities.
- * </p>
- *
- * <h3>Routes</h3>
- * <p>
- * Routes represent possible usages or means of reaching and interacting with
- * a destination. Since destinations may support many different features, they may
- * each offer multiple routes for applications to choose from based on their needs.
- * For example, one route might express the ability to stream locally rendered audio
- * and video to the device; another route might express the ability to send a URL for
- * the destination to download from the network and play all by itself.
- * </p><p>
- * Routes are discovered according to the set of capabilities that
- * an application or the system is seeking to use at a particular time. For example,
- * if an application wants to stream music to a destination then it will ask the
- * {@link MediaRouter} to find routes to destinations can stream music and ignore
- * all other destinations that cannot.
- * </p><p>
- * In general, the application will inspect the set of routes that have been
- * offered then connect to the most appropriate route for its desired purpose.
- * </p>
- *
- * <h3>Discovery</h3>
- * <p>
- * Discovery is the process of finding destinations based on a description of the
- * kinds of routes that an application or the system would like to use.
- * </p><p>
- * Discovery begins when {@link ClientSession#onStartDiscovery} is called and ends when
- * {@link ClientSession#onStopDiscovery} is called. There may be multiple simultaneous
- * discovery requests in progress at the same time from different clients. It is up to
- * the media route service to perform these requests in parallel or multiplex them
- * as required.
- * </p><p>
- * Media route services are <em>strongly encouraged</em> to use the information
- * in the discovery request to optimize discovery and avoid redundant work.
- * In the case where no media device supported by the media route service
- * could possibly offer the requested capabilities, the
- * {@link ClientSession#onStartDiscovery} method should return <code>false</code> to
- * let the system know that it can unbind from the media route service and
- * release its resources.
- * </p>
- *
- * <h3>Settings</h3>
- * <p>
- * Many kinds of devices can be discovered on demand simply by scanning the local network
- * or using wireless protocols such as Bluetooth to find them. However, in some cases
- * it may be necessary for the user to manually configure destinations before they
- * can be used (or to adjust settings later). Actual user configuration of destinations
- * is beyond the scope of this API but media route services may specify an activity
- * in their manifest that the user can launch to perform these tasks.
- * </p><p>
- * Note that media route services that are installed from the store must be enabled
- * by the user before they become available for applications to use.
- * The {@link android.provider.Settings#ACTION_CAST_SETTINGS Settings.ACTION_CAST_SETTINGS}
- * settings activity provides the ability for the user to configure media route services.
- * </p>
- *
- * <h3>Manifest Declaration</h3>
- * <p>
- * Media route services must be declared in the manifest along with meta-data
- * about the kinds of routes that they are capable of discovering. The system
- * uses this information to optimize the set of services to which it binds in
- * order to satisfy a particular discovery request.
- * </p><p>
- * To extend this class, you must declare the service in your manifest file with
- * the {@link android.Manifest.permission#BIND_MEDIA_ROUTE_SERVICE} permission
- * and include an intent filter with the {@link #SERVICE_INTERFACE} action. You must
- * also add meta-data to describe the kinds of routes that your service is capable
- * of discovering.
- * </p><p>
- * For example:
- * </p><pre>
- * <service android:name=".MediaRouteProvider"
- * android:label="@string/service_name"
- * android:permission="android.permission.BIND_MEDIA_ROUTE_SERVICE">
- * <intent-filter>
- * <action android:name="android.media.routing.MediaRouteService" />
- * </intent-filter>
- *
- * TODO: INSERT METADATA DECLARATIONS HERE
- *
- * </service>
- * </pre>
- */
-public abstract class MediaRouteService extends Service {
- private static final String TAG = "MediaRouteService";
-
- private static final boolean DEBUG = true;
-
- private final Handler mHandler;
- private final BinderService mService;
- private final ArrayMap<IBinder, ClientRecord> mClientRecords =
- new ArrayMap<IBinder, ClientRecord>();
-
- private ServiceMetadata mMetadata;
-
- /**
- * The {@link Intent} that must be declared as handled by the service.
- */
- @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
- public static final String SERVICE_INTERFACE =
- "android.media.routing.MediaRouteService";
-
- /**
- * Creates a media route service.
- */
- public MediaRouteService() {
- mHandler = new Handler(true);
- mService = new BinderService();
- }
-
- @Override
- public @Nullable IBinder onBind(Intent intent) {
- if (SERVICE_INTERFACE.equals(intent.getAction())) {
- return mService;
- }
- return null;
- }
-
- /**
- * Creates a new client session on behalf of a client.
- * <p>
- * The implementation should return a {@link ClientSession} for the client
- * to use. The media route service must take care to manage the state of
- * each client session independently from any others that might also be
- * in use at the same time.
- * </p>
- *
- * @param client Information about the client.
- * @return The client session object, or null if the client is not allowed
- * to interact with this media route service.
- */
- public abstract @Nullable ClientSession onCreateClientSession(@NonNull ClientInfo client);
-
- /**
- * Gets metadata about this service.
- * <p>
- * Use this method to obtain a {@link ServiceMetadata} object to provide when creating
- * a {@link android.media.routing.MediaRouter.DestinationInfo.Builder}.
- * </p>
- *
- * @return Metadata about this service.
- */
- public @NonNull ServiceMetadata getServiceMetadata() {
- if (mMetadata == null) {
- try {
- mMetadata = new ServiceMetadata(this);
- } catch (NameNotFoundException ex) {
- Log.wtf(TAG, "Could not retrieve own service metadata!");
- }
- }
- return mMetadata;
- }
-
- /**
- * Enables a single client to access the functionality of the media route service.
- */
- public static abstract class ClientSession {
- /**
- * Starts discovery.
- * <p>
- * If the media route service is capable of discovering routes that satisfy
- * the request then this method should start discovery and return true.
- * Otherwise, this method should return false. If false is returned,
- * then the framework will not call {@link #onStopDiscovery} since discovery
- * was never actually started.
- * </p><p>
- * There may already be other discovery requests in progress at the same time
- * for other clients; the media route service must keep track of them all.
- * </p>
- *
- * @param req The discovery request to start.
- * @param callback A callback to receive discovery events related to this
- * particular request. The events that the service sends to this callback
- * will be sent to the client that initiated the discovery request.
- * @return True if discovery has started. False if the media route service
- * is unable to discover routes that satisfy the request.
- */
- public abstract boolean onStartDiscovery(@NonNull DiscoveryRequest req,
- @NonNull DiscoveryCallback callback);
-
- /**
- * Stops discovery.
- * <p>
- * If {@link #onStartDiscovery} returned true, then this method will eventually
- * be called when the framework no longer requires this discovery request
- * to be performed.
- * </p><p>
- * There may still be other discovery requests in progress for other clients;
- * they must keep working until they have each been stopped by their client.
- * </p>
- */
- public abstract void onStopDiscovery();
-
- /**
- * Starts connecting to a route.
- *
- * @param req The connection request.
- * @param callback A callback to receive events connection events related
- * to this particular request. The events that the service sends to this callback
- * will be sent to the client that initiated the discovery request.
- * @return True if the connection is in progress, or false if the client
- * unable to connect to the requested route.
- */
- public abstract boolean onConnect(@NonNull ConnectionRequest req,
- @NonNull ConnectionCallback callback);
-
- /**
- * Called when the client requests to disconnect from the route
- * or abort a connection attempt in progress.
- */
- public abstract void onDisconnect();
-
- /**
- * Called when the client requests to pause streaming of content to
- * live audio/video routes such as when it goes into the background.
- * <p>
- * The default implementation does nothing.
- * </p>
- */
- public void onPauseStream() { }
-
- /**
- * Called when the application requests to resume streaming of content to
- * live audio/video routes such as when it returns to the foreground.
- * <p>
- * The default implementation does nothing.
- * </p>
- */
- public void onResumeStream() { }
-
- /**
- * Called when the client is releasing the session.
- * <p>
- * The framework automatically takes care of stopping discovery and
- * terminating the connection politely before calling this method to release
- * the session.
- * </p><p>
- * The default implementation does nothing.
- * </p>
- */
- public void onRelease() { }
- }
-
- /**
- * Provides events in response to a discovery request.
- */
- public final class DiscoveryCallback {
- private final ClientRecord mRecord;
-
- DiscoveryCallback(ClientRecord record) {
- mRecord = record;
- }
-
- /**
- * Called by the service when a destination is found that
- * offers one or more routes that satisfy the discovery request.
- * <p>
- * This method should be called whenever the list of available routes
- * at a destination changes or whenever the properties of the destination
- * itself change.
- * </p>
- *
- * @param destination The destination that was found.
- * @param routes The list of that destination's routes that satisfy the
- * discovery request.
- */
- public void onDestinationFound(final @NonNull DestinationInfo destination,
- final @NonNull List<RouteInfo> routes) {
- if (destination == null) {
- throw new IllegalArgumentException("destination must not be null");
- }
- if (routes == null) {
- throw new IllegalArgumentException("routes must not be null");
- }
- for (int i = 0; i < routes.size(); i++) {
- if (routes.get(i).getDestination() != destination) {
- throw new IllegalArgumentException("routes must refer to the "
- + "destination");
- }
- }
-
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchDestinationFound(DiscoveryCallback.this,
- destination, routes);
- }
- });
- }
-
- /**
- * Called by the service when a destination is no longer
- * reachable or is no longer offering any routes that satisfy
- * the discovery request.
- *
- * @param destination The destination that went away.
- */
- public void onDestinationLost(final @NonNull DestinationInfo destination) {
- if (destination == null) {
- throw new IllegalArgumentException("destination must not be null");
- }
-
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchDestinationLost(DiscoveryCallback.this, destination);
- }
- });
- }
-
- /**
- * Called by the service when a discovery has failed in a non-recoverable manner.
- *
- * @param error The error code: one of
- * {@link MediaRouter#DISCOVERY_ERROR_UNKNOWN},
- * {@link MediaRouter#DISCOVERY_ERROR_ABORTED},
- * or {@link MediaRouter#DISCOVERY_ERROR_NO_CONNECTIVITY}.
- * @param message The localized error message, or null if none. This message
- * may be shown to the user.
- * @param extras Additional information about the error which a client
- * may use, or null if none.
- */
- public void onDiscoveryFailed(final @DiscoveryError int error,
- final @Nullable CharSequence message, final @Nullable Bundle extras) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchDiscoveryFailed(DiscoveryCallback.this,
- error, message, extras);
- }
- });
- }
- }
-
- /**
- * Provides events in response to a connection request.
- */
- public final class ConnectionCallback {
- private final ClientRecord mRecord;
-
- ConnectionCallback(ClientRecord record) {
- mRecord = record;
- }
-
- /**
- * Called by the service when the connection succeeds.
- *
- * @param connection Immutable information about the connection.
- */
- public void onConnected(final @NonNull ConnectionInfo connection) {
- if (connection == null) {
- throw new IllegalArgumentException("connection must not be null");
- }
-
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchConnected(ConnectionCallback.this, connection);
- }
- });
- }
-
- /**
- * Called by the service when the connection is terminated normally.
- * <p>
- * Abnormal termination is reported via {@link #onConnectionFailed}.
- * </p>
- */
- public void onDisconnected() {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchDisconnected(ConnectionCallback.this);
- }
- });
- }
-
- /**
- * Called by the service when a connection attempt or connection in
- * progress has failed in a non-recoverable manner.
- *
- * @param error The error code: one of
- * {@link MediaRouter#CONNECTION_ERROR_ABORTED},
- * {@link MediaRouter#CONNECTION_ERROR_UNAUTHORIZED},
- * {@link MediaRouter#CONNECTION_ERROR_UNREACHABLE},
- * {@link MediaRouter#CONNECTION_ERROR_BUSY},
- * {@link MediaRouter#CONNECTION_ERROR_TIMEOUT},
- * {@link MediaRouter#CONNECTION_ERROR_BROKEN},
- * or {@link MediaRouter#CONNECTION_ERROR_BARGED}.
- * @param message The localized error message, or null if none. This message
- * may be shown to the user.
- * @param extras Additional information about the error which a client
- * may use, or null if none.
- */
- public void onConnectionFailed(final @ConnectionError int error,
- final @Nullable CharSequence message, final @Nullable Bundle extras) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mRecord.dispatchConnectionFailed(ConnectionCallback.this,
- error, message, extras);
- }
- });
- }
- }
-
- /**
- * Identifies a client of the media route service.
- */
- public static final class ClientInfo {
- private final int mUid;
- private final String mPackageName;
-
- ClientInfo(int uid, String packageName) {
- mUid = uid;
- mPackageName = packageName;
- }
-
- /**
- * Gets the UID of the client application.
- */
- public int getUid() {
- return mUid;
- }
-
- /**
- * Gets the package name of the client application.
- */
- public @NonNull String getPackageName() {
- return mPackageName;
- }
-
- @Override
- public @NonNull String toString() {
- return "ClientInfo{ uid=" + mUid + ", package=" + mPackageName + " }";
- }
- }
-
- private final class BinderService extends IMediaRouteService.Stub {
- @Override
- public void registerClient(final int clientUid, final String clientPackageName,
- final IMediaRouteClientCallback callback) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientInfo client = new ClientInfo(clientUid, clientPackageName);
- if (DEBUG) {
- Log.d(TAG, "registerClient: client=" + client);
- }
-
- ClientSession session = onCreateClientSession(client);
- if (session == null) {
- // request refused by service
- Log.w(TAG, "Media route service refused to create session for client: "
- + "client=" + client);
- return;
- }
-
- ClientRecord record = new ClientRecord(callback, client, session);
- try {
- callback.asBinder().linkToDeath(record, 0);
- } catch (RemoteException ex) {
- // client died prematurely
- Log.w(TAG, "Client died prematurely while creating session: "
- + "client=" + client);
- record.release();
- return;
- }
-
- mClientRecords.put(callback.asBinder(), record);
- }
- });
- }
-
- @Override
- public void unregisterClient(IMediaRouteClientCallback callback) {
- unregisterClient(callback, false);
- }
-
- void unregisterClient(final IMediaRouteClientCallback callback,
- final boolean died) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.remove(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "unregisterClient: client=" + record.getClientInfo()
- + ", died=" + died);
- }
-
- record.release();
- callback.asBinder().unlinkToDeath(record, 0);
- }
- });
- }
-
- @Override
- public void startDiscovery(final IMediaRouteClientCallback callback,
- final int seq, final List<MediaRouteSelector> selectors,
- final int flags) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "startDiscovery: client=" + record.getClientInfo()
- + ", seq=" + seq + ", selectors=" + selectors
- + ", flags=0x" + Integer.toHexString(flags));
- }
- record.startDiscovery(seq, selectors, flags);
- }
- });
- }
-
- @Override
- public void stopDiscovery(final IMediaRouteClientCallback callback) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "stopDiscovery: client=" + record.getClientInfo());
- }
- record.stopDiscovery();
- }
- });
- }
-
- @Override
- public void connect(final IMediaRouteClientCallback callback,
- final int seq, final String destinationId, final String routeId,
- final int flags, final Bundle extras) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "connect: client=" + record.getClientInfo()
- + ", seq=" + seq + ", destinationId=" + destinationId
- + ", routeId=" + routeId
- + ", flags=0x" + Integer.toHexString(flags)
- + ", extras=" + extras);
- }
- record.connect(seq, destinationId, routeId, flags, extras);
- }
- });
- }
-
- @Override
- public void disconnect(final IMediaRouteClientCallback callback) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "disconnect: client=" + record.getClientInfo());
- }
- record.disconnect();
- }
- });
- }
-
- @Override
- public void pauseStream(final IMediaRouteClientCallback callback) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "pauseStream: client=" + record.getClientInfo());
- }
- record.pauseStream();
- }
- });
- }
-
- @Override
- public void resumeStream(final IMediaRouteClientCallback callback) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- ClientRecord record = mClientRecords.get(callback.asBinder());
- if (record == null) {
- return; // spurious
- }
-
- if (DEBUG) {
- Log.d(TAG, "resumeStream: client=" + record.getClientInfo());
- }
- record.resumeStream();
- }
- });
- }
- }
-
- // Must be accessed on handler
- private final class ClientRecord implements IBinder.DeathRecipient {
- private final IMediaRouteClientCallback mClientCallback;
- private final ClientInfo mClient;
- private final ClientSession mSession;
-
- private int mDiscoverySeq;
- private DiscoveryRequest mDiscoveryRequest;
- private DiscoveryCallback mDiscoveryCallback;
- private final ArrayMap<String, DestinationRecord> mDestinations =
- new ArrayMap<String, DestinationRecord>();
-
- private int mConnectionSeq;
- private ConnectionRequest mConnectionRequest;
- private ConnectionCallback mConnectionCallback;
- private ConnectionInfo mConnection;
- private boolean mConnectionPaused;
-
- public ClientRecord(IMediaRouteClientCallback callback,
- ClientInfo client, ClientSession session) {
- mClientCallback = callback;
- mClient = client;
- mSession = session;
- }
-
- // Invoked on binder thread unlike all other methods in this class.
- @Override
- public void binderDied() {
- mService.unregisterClient(mClientCallback, true);
- }
-
- public ClientInfo getClientInfo() {
- return mClient;
- }
-
- public void release() {
- stopDiscovery();
- disconnect();
- }
-
- public void startDiscovery(int seq, List<MediaRouteSelector> selectors,
- int flags) {
- stopDiscovery();
-
- mDiscoverySeq = seq;
- mDiscoveryRequest = new DiscoveryRequest(selectors);
- mDiscoveryRequest.setFlags(flags);
- mDiscoveryCallback = new DiscoveryCallback(this);
- boolean started = mSession.onStartDiscovery(mDiscoveryRequest, mDiscoveryCallback);
- if (!started) {
- dispatchDiscoveryFailed(mDiscoveryCallback,
- MediaRouter.DISCOVERY_ERROR_ABORTED, null, null);
- clearDiscovery();
- }
- }
-
- public void stopDiscovery() {
- if (mDiscoveryRequest != null) {
- mSession.onStopDiscovery();
- clearDiscovery();
- }
- }
-
- private void clearDiscovery() {
- mDestinations.clear();
- mDiscoveryRequest = null;
- mDiscoveryCallback = null;
- }
-
- public void connect(int seq, String destinationId, String routeId,
- int flags, Bundle extras) {
- disconnect();
-
- mConnectionSeq = seq;
- mConnectionCallback = new ConnectionCallback(this);
-
- DestinationRecord destinationRecord = mDestinations.get(destinationId);
- if (destinationRecord == null) {
- Log.w(TAG, "Aborting connection to route since no matching destination "
- + "was found in the list of known destinations: "
- + "destinationId=" + destinationId);
- dispatchConnectionFailed(mConnectionCallback,
- MediaRouter.CONNECTION_ERROR_ABORTED, null, null);
- clearConnection();
- return;
- }
-
- RouteInfo route = destinationRecord.getRoute(routeId);
- if (route == null) {
- Log.w(TAG, "Aborting connection to route since no matching route "
- + "was found in the list of known routes: "
- + "destination=" + destinationRecord.destination
- + ", routeId=" + routeId);
- dispatchConnectionFailed(mConnectionCallback,
- MediaRouter.CONNECTION_ERROR_ABORTED, null, null);
- clearConnection();
- return;
- }
-
- mConnectionRequest = new ConnectionRequest(route);
- mConnectionRequest.setFlags(flags);
- mConnectionRequest.setExtras(extras);
- boolean started = mSession.onConnect(mConnectionRequest, mConnectionCallback);
- if (!started) {
- dispatchConnectionFailed(mConnectionCallback,
- MediaRouter.CONNECTION_ERROR_ABORTED, null, null);
- clearConnection();
- }
- }
-
- public void disconnect() {
- if (mConnectionRequest != null) {
- mSession.onDisconnect();
- clearConnection();
- }
- }
-
- private void clearConnection() {
- mConnectionRequest = null;
- mConnectionCallback = null;
- if (mConnection != null) {
- mConnection.close();
- mConnection = null;
- }
- mConnectionPaused = false;
- }
-
- public void pauseStream() {
- if (mConnectionRequest != null && !mConnectionPaused) {
- mConnectionPaused = true;
- mSession.onPauseStream();
- }
- }
-
- public void resumeStream() {
- if (mConnectionRequest != null && mConnectionPaused) {
- mConnectionPaused = false;
- mSession.onResumeStream();
- }
- }
-
- public void dispatchDestinationFound(DiscoveryCallback callback,
- DestinationInfo destination, List<RouteInfo> routes) {
- if (callback == mDiscoveryCallback) {
- if (DEBUG) {
- Log.d(TAG, "destinationFound: destination=" + destination
- + ", routes=" + routes);
- }
- mDestinations.put(destination.getId(),
- new DestinationRecord(destination, routes));
-
- ParcelableDestinationInfo pdi = new ParcelableDestinationInfo();
- pdi.id = destination.getId();
- pdi.name = destination.getName();
- pdi.description = destination.getDescription();
- pdi.iconResourceId = destination.getIconResourceId();
- pdi.extras = destination.getExtras();
- ArrayList<ParcelableRouteInfo> pris = new ArrayList<ParcelableRouteInfo>();
- for (RouteInfo route : routes) {
- int selectorIndex = mDiscoveryRequest.getSelectors().indexOf(
- route.getSelector());
- if (selectorIndex < 0) {
- Log.w(TAG, "Ignoring route because the selector does not match "
- + "any of those that were originally supplied by the "
- + "client's discovery request: destination=" + destination
- + ", route=" + route);
- continue;
- }
-
- ParcelableRouteInfo pri = new ParcelableRouteInfo();
- pri.id = route.getId();
- pri.selectorIndex = selectorIndex;
- pri.features = route.getFeatures();
- pri.protocols = route.getProtocols().toArray(
- new String[route.getProtocols().size()]);
- pri.extras = route.getExtras();
- pris.add(pri);
- }
- try {
- mClientCallback.onDestinationFound(mDiscoverySeq, pdi,
- pris.toArray(new ParcelableRouteInfo[pris.size()]));
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- }
- }
-
- public void dispatchDestinationLost(DiscoveryCallback callback,
- DestinationInfo destination) {
- if (callback == mDiscoveryCallback) {
- if (DEBUG) {
- Log.d(TAG, "destinationLost: destination=" + destination);
- }
-
- if (mDestinations.get(destination.getId()).destination == destination) {
- mDestinations.remove(destination.getId());
- try {
- mClientCallback.onDestinationLost(mDiscoverySeq, destination.getId());
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- }
- }
- }
-
- public void dispatchDiscoveryFailed(DiscoveryCallback callback,
- int error, CharSequence message, Bundle extras) {
- if (callback == mDiscoveryCallback) {
- if (DEBUG) {
- Log.d(TAG, "discoveryFailed: error=" + error + ", message=" + message
- + ", extras=" + extras);
- }
-
- try {
- mClientCallback.onDiscoveryFailed(mDiscoverySeq, error, message, extras);
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- }
- }
-
- public void dispatchConnected(ConnectionCallback callback, ConnectionInfo connection) {
- if (callback == mConnectionCallback) {
- if (DEBUG) {
- Log.d(TAG, "connected: connection=" + connection);
- }
- if (mConnection == null) {
- mConnection = connection;
-
- ParcelableConnectionInfo pci = new ParcelableConnectionInfo();
- pci.audioAttributes = connection.getAudioAttributes();
- pci.presentationDisplayId = connection.getPresentationDisplay() != null ?
- connection.getPresentationDisplay().getDisplayId() : -1;
- pci.protocolBinders = new IBinder[connection.getProtocols().size()];
- for (int i = 0; i < pci.protocolBinders.length; i++) {
- pci.protocolBinders[i] = connection.getProtocolBinder(i);
- }
- pci.extras = connection.getExtras();
- try {
- mClientCallback.onConnected(mConnectionSeq, pci);
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- } else {
- Log.w(TAG, "Media route service called onConnected() while already "
- + "connected.");
- }
- }
- }
-
- public void dispatchDisconnected(ConnectionCallback callback) {
- if (callback == mConnectionCallback) {
- if (DEBUG) {
- Log.d(TAG, "disconnected");
- }
-
- if (mConnection != null) {
- mConnection.close();
- mConnection = null;
-
- try {
- mClientCallback.onDisconnected(mConnectionSeq);
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- }
- }
- }
-
- public void dispatchConnectionFailed(ConnectionCallback callback,
- int error, CharSequence message, Bundle extras) {
- if (callback == mConnectionCallback) {
- if (DEBUG) {
- Log.d(TAG, "connectionFailed: error=" + error + ", message=" + message
- + ", extras=" + extras);
- }
-
- try {
- mClientCallback.onConnectionFailed(mConnectionSeq, error, message, extras);
- } catch (RemoteException ex) {
- // binder death handled elsewhere
- }
- }
- }
- }
-
- private static final class DestinationRecord {
- public final DestinationInfo destination;
- public final List<RouteInfo> routes;
-
- public DestinationRecord(DestinationInfo destination, List<RouteInfo> routes) {
- this.destination = destination;
- this.routes = routes;
- }
-
- public RouteInfo getRoute(String routeId) {
- final int count = routes.size();
- for (int i = 0; i < count; i++) {
- RouteInfo route = routes.get(i);
- if (route.getId().equals(routeId)) {
- return route;
- }
- }
- return null;
- }
- }
-}
diff --git a/media/java/android/media/routing/MediaRouter.java b/media/java/android/media/routing/MediaRouter.java
deleted file mode 100644
index 4f6d324..0000000
--- a/media/java/android/media/routing/MediaRouter.java
+++ /dev/null
@@ -1,1886 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.annotation.DrawableRes;
-import android.annotation.IntDef;
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.app.Presentation;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ServiceInfo;
-import android.graphics.drawable.Drawable;
-import android.hardware.display.DisplayManager;
-import android.media.AudioAttributes;
-import android.media.AudioManager;
-import android.media.AudioTrack;
-import android.media.VolumeProvider;
-import android.media.session.MediaController;
-import android.media.session.MediaSession;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.view.Display;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Media router allows applications to discover, connect to, control,
- * and send content to nearby media devices known as destinations.
- * <p>
- * There are generally two participants involved in media routing: an
- * application that wants to send media content to a destination and a
- * {@link MediaRouteService media route service} that provides the
- * service of transporting that content where it needs to go on behalf of the
- * application.
- * </p><p>
- * To send media content to a destination, the application must ask the system
- * to discover available routes to destinations that provide certain capabilities,
- * establish a connection to a route, then send messages through the connection to
- * control the routing of audio and video streams, launch remote applications,
- * and invoke other functions of the destination.
- * </p><p>
- * Media router objects are thread-safe.
- * </p>
- *
- * <h3>Destinations</h3>
- * <p>
- * The media devices to which an application may send media content are referred
- * to in the API as destinations. Each destination therefore represents a single
- * independent device such as a speaker or TV set. Destinations are given meaningful
- * names and descriptions to help the user associate them with devices in their
- * environment.
- * </p><p>
- * Destinations may be local or remote and may be accessed through various means,
- * often wirelessly. The user may install media route services to enable
- * media applications to connect to a variety of destinations with different
- * capabilities.
- * </p>
- *
- * <h3>Routes</h3>
- * <p>
- * Routes represent possible usages or means of reaching and interacting with
- * a destination. Since destinations may support many different features, they may
- * each offer multiple routes for applications to choose from based on their needs.
- * For example, one route might express the ability to stream locally rendered audio
- * and video to the device; another route might express the ability to send a URL for
- * the destination to download from the network and play all by itself.
- * </p><p>
- * Routes are discovered according to the set of capabilities that
- * an application or the system is seeking to use at a particular time. For example,
- * if an application wants to stream music to a destination then it will ask the
- * {@link MediaRouter} to find routes to destinations can stream music and ignore
- * all other destinations that cannot.
- * </p><p>
- * In general, the application will inspect the set of routes that have been
- * offered then connect to the most appropriate route for its desired purpose.
- * </p>
- *
- * <h3>Route Selection</h3>
- * <p>
- * When the user open the media route chooser activity, the system will display
- * a list of nearby media destinations which have been discovered. After the
- * choice is made the application may connect to one of the routes offered by
- * this destination and begin communicating with the destination.
- * </p><p>
- * Destinations are located through a process called discovery. During discovery,
- * the system will start installed {@link MediaRouteService media route services}
- * to scan the network for nearby devices that offer the kinds of capabilities that the
- * application is seeking to use. The application specifies the capabilities it requires by
- * adding {@link MediaRouteSelector media route selectors} to the media router
- * using the {@link #addSelector} method. Only destinations that provide routes
- * which satisfy at least one of these media route selectors will be discovered.
- * </p><p>
- * Once the user has selected a destination, the application will be given a chance
- * to choose one of the routes to which it would like to connect. The application
- * may switch to a different route from the same destination at a later time but
- * in order to connect to a new destination, the application must once again launch
- * the media route chooser activity to ask the user to choose a destination.
- * </p>
- *
- * <h3>Route Protocols</h3>
- * <p>
- * Route protocols express capabilities offered by routes. Each media route selector
- * must specify at least one required protocol by which the routes will be selected.
- * </p><p>
- * The framework provides several predefined <code>MediaRouteProtocols</code> which are
- * defined in the <code>android-support-media-protocols.jar</code> support library.
- * Applications must statically link this library to make use of these protocols.
- * </p><p>
- * The static library approach is used to enable ongoing extension and refinement
- * of protocols in the SDK and interoperability with the media router implementation
- * for older platform versions which is offered by the framework support library.
- * </p><p>
- * Media route services may also define custom media route protocols of their own
- * to enable applications to access specialized capabilities of certain destinations
- * assuming they have linked in the required protocol code.
- * </p><p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code> for more information.
- * </p>
- *
- * <h3>Connections</h3>
- * <p>
- * After connecting to a media route, the application can send commands to
- * the route using any of the protocols that it requested. If the route supports live
- * audio or video streaming then the application can create an {@link AudioTrack} or
- * {@link Presentation} to route locally generated content to the destination.
- * </p>
- *
- * <h3>Delegation</h3>
- * <p>
- * The creator of the media router is responsible for establishing the policy for
- * discovering and connecting to destinations. UI components may observe the state
- * of the media router by {@link #createDelegate creating} a {@link Delegate}.
- * </p><p>
- * The media router should also be attached to the {@link MediaSession media session}
- * that is handling media playback lifecycle. This will allow
- * authorized {@link MediaController media controllers}, possibly running in other
- * processes, to provide UI to examine and change the media destination by
- * {@link MediaController#createMediaRouterDelegate creating} a {@link Delegate}
- * for the media router associated with the session.
- * </p>
- */
-public final class MediaRouter {
- private final DisplayManager mDisplayManager;
-
- private final Object mLock = new Object();
-
- private RoutingCallback mRoutingCallback;
- private Handler mRoutingCallbackHandler;
-
- private boolean mReleased;
- private int mDiscoveryState;
- private int mConnectionState;
- private final ArrayList<MediaRouteSelector> mSelectors =
- new ArrayList<MediaRouteSelector>();
- private final ArrayMap<DestinationInfo, List<RouteInfo>> mDiscoveredDestinations =
- new ArrayMap<DestinationInfo, List<RouteInfo>>();
- private RouteInfo mSelectedRoute;
- private ConnectionInfo mConnection;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(value = { DISCOVERY_STATE_STOPPED, DISCOVERY_STATE_STARTED })
- public @interface DiscoveryState { }
-
- /**
- * Discovery state: Discovery is not currently in progress.
- */
- public static final int DISCOVERY_STATE_STOPPED = 0;
-
- /**
- * Discovery state: Discovery is being performed.
- */
- public static final int DISCOVERY_STATE_STARTED = 1;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, value = { DISCOVERY_FLAG_BACKGROUND })
- public @interface DiscoveryFlags { }
-
- /**
- * Discovery flag: Indicates that the client has requested passive discovery in
- * the background. The media route service should try to use less power and rely
- * more on its internal caches to minimize its impact.
- */
- public static final int DISCOVERY_FLAG_BACKGROUND = 1 << 0;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(value = { DISCOVERY_ERROR_UNKNOWN, DISCOVERY_ERROR_ABORTED,
- DISCOVERY_ERROR_NO_CONNECTIVITY })
- public @interface DiscoveryError { }
-
- /**
- * Discovery error: Unknown error; refer to the error message for details.
- */
- public static final int DISCOVERY_ERROR_UNKNOWN = 0;
-
- /**
- * Discovery error: The media router or media route service has decided not to
- * handle the discovery request for some reason.
- */
- public static final int DISCOVERY_ERROR_ABORTED = 1;
-
- /**
- * Discovery error: The media route service is unable to perform discovery
- * due to a lack of connectivity such as because the radio is disabled.
- */
- public static final int DISCOVERY_ERROR_NO_CONNECTIVITY = 2;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(value = { CONNECTION_STATE_DISCONNECTED, CONNECTION_STATE_CONNECTING,
- CONNECTION_STATE_CONNECTED })
- public @interface ConnectionState { }
-
- /**
- * Connection state: No destination has been selected. Media content should
- * be sent to the default output.
- */
- public static final int CONNECTION_STATE_DISCONNECTED = 0;
-
- /**
- * Connection state: The application is in the process of connecting to
- * a route offered by the selected destination.
- */
- public static final int CONNECTION_STATE_CONNECTING = 1;
-
- /**
- * Connection state: The application has connected to a route offered by
- * the selected destination.
- */
- public static final int CONNECTION_STATE_CONNECTED = 2;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, value = { CONNECTION_FLAG_BARGE })
- public @interface ConnectionFlags { }
-
- /**
- * Connection flag: Indicates that the client has requested to barge in and evict
- * other clients that might have already connected to the destination and that
- * would otherwise prevent this client from connecting. When this flag is not
- * set, the media route service should be polite and report
- * {@link MediaRouter#CONNECTION_ERROR_BUSY} in case the destination is
- * already occupied and cannot accept additional connections.
- */
- public static final int CONNECTION_FLAG_BARGE = 1 << 0;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(value = { CONNECTION_ERROR_UNKNOWN, CONNECTION_ERROR_ABORTED,
- CONNECTION_ERROR_UNAUTHORIZED, CONNECTION_ERROR_UNAUTHORIZED,
- CONNECTION_ERROR_BUSY, CONNECTION_ERROR_TIMEOUT, CONNECTION_ERROR_BROKEN })
- public @interface ConnectionError { }
-
- /**
- * Connection error: Unknown error; refer to the error message for details.
- */
- public static final int CONNECTION_ERROR_UNKNOWN = 0;
-
- /**
- * Connection error: The media router or media route service has decided not to
- * handle the connection request for some reason.
- */
- public static final int CONNECTION_ERROR_ABORTED = 1;
-
- /**
- * Connection error: The device has refused the connection from this client.
- * This error should be avoided because the media route service should attempt
- * to filter out devices that the client cannot access as it performs discovery
- * on behalf of that client.
- */
- public static final int CONNECTION_ERROR_UNAUTHORIZED = 2;
-
- /**
- * Connection error: The device is unreachable over the network.
- */
- public static final int CONNECTION_ERROR_UNREACHABLE = 3;
-
- /**
- * Connection error: The device is already busy serving another client and
- * the connection request did not ask to barge in.
- */
- public static final int CONNECTION_ERROR_BUSY = 4;
-
- /**
- * Connection error: A timeout occurred during connection.
- */
- public static final int CONNECTION_ERROR_TIMEOUT = 5;
-
- /**
- * Connection error: The connection to the device was severed unexpectedly.
- */
- public static final int CONNECTION_ERROR_BROKEN = 6;
-
- /**
- * Connection error: The connection was terminated because a different client barged
- * in and took control of the destination.
- */
- public static final int CONNECTION_ERROR_BARGED = 7;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(value = { DISCONNECTION_REASON_APPLICATION_REQUEST,
- DISCONNECTION_REASON_USER_REQUEST, DISCONNECTION_REASON_ERROR })
- public @interface DisconnectionReason { }
-
- /**
- * Disconnection reason: The application requested disconnection itself.
- */
- public static final int DISCONNECTION_REASON_APPLICATION_REQUEST = 0;
-
- /**
- * Disconnection reason: The user requested disconnection.
- */
- public static final int DISCONNECTION_REASON_USER_REQUEST = 1;
-
- /**
- * Disconnection reason: An error occurred.
- */
- public static final int DISCONNECTION_REASON_ERROR = 2;
-
- /** @hide */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, value = { ROUTE_FEATURE_LIVE_AUDIO, ROUTE_FEATURE_LIVE_VIDEO })
- public @interface RouteFeatures { }
-
- /**
- * Route feature: Live audio.
- * <p>
- * A route that supports live audio streams audio rendered by the application
- * to the destination.
- * </p><p>
- * To take advantage of live audio routing, the application must render its
- * media using the audio attributes specified by {@link #getPreferredAudioAttributes}.
- * </p>
- *
- * @see #getPreferredAudioAttributes
- * @see android.media.AudioAttributes
- */
- public static final int ROUTE_FEATURE_LIVE_AUDIO = 1 << 0;
-
- /**
- * Route feature: Live video.
- * <p>
- * A route that supports live video streams video rendered by the application
- * to the destination.
- * </p><p>
- * To take advantage of live video routing, the application must render its
- * media to a {@link android.app.Presentation presentation window} on the
- * display specified by {@link #getPreferredPresentationDisplay}.
- * </p>
- *
- * @see #getPreferredPresentationDisplay
- * @see android.app.Presentation
- */
- public static final int ROUTE_FEATURE_LIVE_VIDEO = 1 << 1;
-
- /**
- * Creates a media router.
- *
- * @param context The context with which the router is associated.
- */
- public MediaRouter(@NonNull Context context) {
- if (context == null) {
- throw new IllegalArgumentException("context must not be null");
- }
-
- mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
- }
-
- /** @hide */
- public IMediaRouter getBinder() {
- // todo
- return null;
- }
-
- /**
- * Disconnects from the selected destination and releases the media router.
- * <p>
- * This method should be called by the application when it no longer requires
- * the media router to ensure that all bound resources may be cleaned up.
- * </p>
- */
- public void release() {
- synchronized (mLock) {
- mReleased = true;
- // todo
- }
- }
-
- /**
- * Returns true if the media router has been released.
- */
- public boolean isReleased() {
- synchronized (mLock) {
- return mReleased;
- }
- }
-
- /**
- * Gets the current route discovery state.
- *
- * @return The current discovery state: one of {@link #DISCOVERY_STATE_STOPPED},
- * {@link #DISCOVERY_STATE_STARTED}.
- */
- public @DiscoveryState int getDiscoveryState() {
- synchronized (mLock) {
- return mDiscoveryState;
- }
- }
-
- /**
- * Gets the current route connection state.
- *
- * @return The current state: one of {@link #CONNECTION_STATE_DISCONNECTED},
- * {@link #CONNECTION_STATE_CONNECTING} or {@link #CONNECTION_STATE_CONNECTED}.
- */
- public @ConnectionState int getConnectionState() {
- synchronized (mLock) {
- return mConnectionState;
- }
- }
-
- /**
- * Creates a media router delegate through which the destination of the media
- * router may be controlled.
- * <p>
- * This is the point of entry for UI code that initiates discovery and
- * connection to routes.
- * </p>
- */
- public @NonNull Delegate createDelegate() {
- return null; // todo
- }
-
- /**
- * Sets a callback to participate in route discovery, filtering, and connection
- * establishment.
- *
- * @param callback The callback to set, or null if none.
- * @param handler The handler to receive callbacks, or null to use the current thread.
- */
- public void setRoutingCallback(@Nullable RoutingCallback callback,
- @Nullable Handler handler) {
- synchronized (mLock) {
- if (callback == null) {
- mRoutingCallback = null;
- mRoutingCallbackHandler = null;
- } else {
- mRoutingCallback = callback;
- mRoutingCallbackHandler = handler != null ? handler : new Handler();
- }
- }
- }
-
- /**
- * Adds a media route selector to use to find destinations that have
- * routes with the specified capabilities during route discovery.
- */
- public void addSelector(@NonNull MediaRouteSelector selector) {
- if (selector == null) {
- throw new IllegalArgumentException("selector must not be null");
- }
-
- synchronized (mLock) {
- if (!mSelectors.contains(selector)) {
- mSelectors.add(selector);
- // todo
- }
- }
- }
-
- /**
- * Removes a media route selector.
- */
- public void removeSelector(@NonNull MediaRouteSelector selector) {
- if (selector == null) {
- throw new IllegalArgumentException("selector must not be null");
- }
-
- synchronized (mLock) {
- if (mSelectors.remove(selector)) {
- // todo
- }
- }
- }
-
- /**
- * Removes all media route selectors.
- * <p>
- * Note that at least one selector must be added in order to perform discovery.
- * </p>
- */
- public void clearSelectors() {
- synchronized (mLock) {
- if (!mSelectors.isEmpty()) {
- mSelectors.clear();
- // todo
- }
- }
- }
-
- /**
- * Gets a list of all media route selectors to consider during discovery.
- */
- public @NonNull List<MediaRouteSelector> getSelectors() {
- synchronized (mLock) {
- return new ArrayList<MediaRouteSelector>(mSelectors);
- }
- }
-
- /**
- * Gets the connection to the currently selected route.
- *
- * @return The connection to the currently selected route, or null if not connected.
- */
- public @NonNull ConnectionInfo getConnection() {
- synchronized (mLock) {
- return mConnection;
- }
- }
-
- /**
- * Gets the list of discovered destinations.
- * <p>
- * This list is only valid while discovery is running and is null otherwise.
- * </p>
- *
- * @return The list of discovered destinations, or null if discovery is not running.
- */
- public @NonNull List<DestinationInfo> getDiscoveredDestinations() {
- synchronized (mLock) {
- if (mDiscoveryState == DISCOVERY_STATE_STARTED) {
- return new ArrayList<DestinationInfo>(mDiscoveredDestinations.keySet());
- }
- return null;
- }
- }
-
- /**
- * Gets the list of discovered routes for a particular destination.
- * <p>
- * This list is only valid while discovery is running and is null otherwise.
- * </p>
- *
- * @param destination The destination for which to get the list of discovered routes.
- * @return The list of discovered routes for the destination, or null if discovery
- * is not running.
- */
- public @NonNull List<RouteInfo> getDiscoveredRoutes(@NonNull DestinationInfo destination) {
- if (destination == null) {
- throw new IllegalArgumentException("destination must not be null");
- }
- synchronized (mLock) {
- if (mDiscoveryState == DISCOVERY_STATE_STARTED) {
- List<RouteInfo> routes = mDiscoveredDestinations.get(destination);
- if (routes != null) {
- return new ArrayList<RouteInfo>(routes);
- }
- }
- return null;
- }
- }
-
- /**
- * Gets the destination that has been selected.
- *
- * @return The selected destination, or null if disconnected.
- */
- public @Nullable DestinationInfo getSelectedDestination() {
- synchronized (mLock) {
- return mSelectedRoute != null ? mSelectedRoute.getDestination() : null;
- }
- }
-
- /**
- * Gets the route that has been selected.
- *
- * @return The selected destination, or null if disconnected.
- */
- public @Nullable RouteInfo getSelectedRoute() {
- synchronized (mLock) {
- return mSelectedRoute;
- }
- }
-
- /**
- * Gets the preferred audio attributes that should be used to stream live audio content
- * based on the connected route.
- * <p>
- * Use an {@link AudioTrack} to send audio content to the destination with these
- * audio attributes.
- * </p><p>
- * The preferred audio attributes may change when a connection is established but it
- * will remain constant until disconnected.
- * </p>
- *
- * @return The preferred audio attributes to use. When connected, returns the
- * route's audio attributes or null if it does not support live audio streaming.
- * Otherwise returns audio attributes associated with {@link AudioAttributes#USAGE_MEDIA}.
- */
- public @Nullable AudioAttributes getPreferredAudioAttributes() {
- synchronized (mLock) {
- if (mConnection != null) {
- return mConnection.getAudioAttributes();
- }
- return new AudioAttributes.Builder()
- .setLegacyStreamType(AudioManager.STREAM_MUSIC)
- .build();
- }
- }
-
- /**
- * Gets the preferred presentation display that should be used to stream live video content
- * based on the connected route.
- * <p>
- * Use a {@link Presentation} to send video content to the destination with this display.
- * </p><p>
- * The preferred presentation display may change when a connection is established but it
- * will remain constant until disconnected.
- * </p>
- *
- * @return The preferred presentation display to use. When connected, returns
- * the route's presentation display or null if it does not support live video
- * streaming. Otherwise returns the first available
- * {@link DisplayManager#DISPLAY_CATEGORY_PRESENTATION presentation display},
- * such as a mirrored wireless or HDMI display or null if none.
- */
- public @Nullable Display getPreferredPresentationDisplay() {
- synchronized (mLock) {
- if (mConnection != null) {
- return mConnection.getPresentationDisplay();
- }
- Display[] displays = mDisplayManager.getDisplays(
- DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
- return displays.length != 0 ? displays[0] : null;
- }
- }
-
- /**
- * Gets the preferred volume provider that should be used to control the volume
- * of content rendered on the currently selected route.
- * <p>
- * The preferred volume provider may change when a connection is established but it
- * will remain the same until disconnected.
- * </p>
- *
- * @return The preferred volume provider to use, or null if the currently
- * selected route does not support remote volume adjustment or if the connection
- * is not yet established. If no route is selected, returns null to indicate
- * that system volume control should be used.
- */
- public @Nullable VolumeProvider getPreferredVolumeProvider() {
- synchronized (mLock) {
- if (mConnection != null) {
- return mConnection.getVolumeProvider();
- }
- return null;
- }
- }
-
- /**
- * Requests to pause streaming of live audio or video routes.
- * Should be called when the application is going into the background and is
- * no longer rendering content locally.
- * <p>
- * This method does nothing unless a connection has been established.
- * </p>
- */
- public void pauseStream() {
- // todo
- }
-
- /**
- * Requests to resume streaming of live audio or video routes.
- * May be called when the application is returning to the foreground and is
- * about to resume rendering content locally.
- * <p>
- * This method does nothing unless a connection has been established.
- * </p>
- */
- public void resumeStream() {
- // todo
- }
-
- /**
- * This class is used by UI components to let the user discover and
- * select a destination to which the media router should connect.
- * <p>
- * This API has somewhat more limited functionality than the {@link MediaRouter}
- * itself because it is designed to allow applications to control
- * the destination of media router instances that belong to other processes.
- * </p><p>
- * To control the destination of your own media router, call
- * {@link #createDelegate} to obtain a local delegate object.
- * </p><p>
- * To control the destination of a media router that belongs to another process,
- * first obtain a {@link MediaController} that is associated with the media playback
- * that is occurring in that process, then call
- * {@link MediaController#createMediaRouterDelegate} to obtain an instance of
- * its destination controls. Note that special permissions may be required to
- * obtain the {@link MediaController} instance in the first place.
- * </p>
- */
- public static final class Delegate {
- /**
- * Returns true if the media router has been released.
- */
- public boolean isReleased() {
- // todo
- return false;
- }
-
- /**
- * Gets the current route discovery state.
- *
- * @return The current discovery state: one of {@link #DISCOVERY_STATE_STOPPED},
- * {@link #DISCOVERY_STATE_STARTED}.
- */
- public @DiscoveryState int getDiscoveryState() {
- // todo
- return -1;
- }
-
- /**
- * Gets the current route connection state.
- *
- * @return The current state: one of {@link #CONNECTION_STATE_DISCONNECTED},
- * {@link #CONNECTION_STATE_CONNECTING} or {@link #CONNECTION_STATE_CONNECTED}.
- */
- public @ConnectionState int getConnectionState() {
- // todo
- return -1;
- }
-
- /**
- * Gets the currently selected destination.
- *
- * @return The destination information, or null if none.
- */
- public @Nullable DestinationInfo getSelectedDestination() {
- return null;
- }
-
- /**
- * Gets the list of discovered destinations.
- * <p>
- * This list is only valid while discovery is running and is null otherwise.
- * </p>
- *
- * @return The list of discovered destinations, or null if discovery is not running.
- */
- public @NonNull List<DestinationInfo> getDiscoveredDestinations() {
- return null;
- }
-
- /**
- * Adds a callback to receive state changes.
- *
- * @param callback The callback to set, or null if none.
- * @param handler The handler to receive callbacks, or null to use the current thread.
- */
- public void addStateCallback(@Nullable StateCallback callback,
- @Nullable Handler handler) {
- if (callback == null) {
- throw new IllegalArgumentException("callback must not be null");
- }
- if (handler == null) {
- handler = new Handler();
- }
- // todo
- }
-
- /**
- * Removes a callback for state changes.
- *
- * @param callback The callback to set, or null if none.
- */
- public void removeStateCallback(@Nullable StateCallback callback) {
- // todo
- }
-
- /**
- * Starts performing discovery.
- * <p>
- * Performing discovery is expensive. Make sure to call {@link #stopDiscovery}
- * as soon as possible once a new destination has been selected to allow the system
- * to stop services associated with discovery.
- * </p>
- *
- * @param flags The discovery flags, such as {@link MediaRouter#DISCOVERY_FLAG_BACKGROUND}.
- */
- public void startDiscovery(@DiscoveryFlags int flags) {
- // todo
- }
-
- /**
- * Stops performing discovery.
- */
- public void stopDiscovery() {
- // todo
- }
-
- /**
- * Connects to a destination during route discovery.
- * <p>
- * This method may only be called while route discovery is active and the
- * destination appears in the
- * {@link #getDiscoveredDestinations list of discovered destinations}.
- * If the media router is already connected to a route then it will first disconnect
- * from the current route then connect to the new route.
- * </p>
- *
- * @param destination The destination to which the media router should connect.
- * @param flags The connection flags, such as {@link MediaRouter#CONNECTION_FLAG_BARGE}.
- */
- public void connect(@NonNull DestinationInfo destination, @DiscoveryFlags int flags) {
- // todo
- }
-
- /**
- * Disconnects from the currently selected destination.
- * <p>
- * Does nothing if not currently connected.
- * </p>
- *
- * @param reason The reason for the disconnection: one of
- * {@link #DISCONNECTION_REASON_APPLICATION_REQUEST},
- * {@link #DISCONNECTION_REASON_USER_REQUEST}, or {@link #DISCONNECTION_REASON_ERROR}.
- */
- public void disconnect(@DisconnectionReason int reason) {
- // todo
- }
- }
-
- /**
- * Describes immutable properties of a connection to a route.
- */
- public static final class ConnectionInfo {
- private final RouteInfo mRoute;
- private final AudioAttributes mAudioAttributes;
- private final Display mPresentationDisplay;
- private final VolumeProvider mVolumeProvider;
- private final IBinder[] mProtocolBinders;
- private final Object[] mProtocolInstances;
- private final Bundle mExtras;
- private final ArrayList<Closeable> mCloseables;
-
- private static final Class<?>[] MEDIA_ROUTE_PROTOCOL_CTOR_PARAMETERS =
- new Class<?>[] { IBinder.class };
-
- ConnectionInfo(RouteInfo route,
- AudioAttributes audioAttributes, Display display,
- VolumeProvider volumeProvider, IBinder[] protocolBinders,
- Bundle extras, ArrayList<Closeable> closeables) {
- mRoute = route;
- mAudioAttributes = audioAttributes;
- mPresentationDisplay = display;
- mVolumeProvider = volumeProvider;
- mProtocolBinders = protocolBinders;
- mProtocolInstances = new Object[mProtocolBinders.length];
- mExtras = extras;
- mCloseables = closeables;
- }
-
- /**
- * Gets the route that is connected.
- */
- public @NonNull RouteInfo getRoute() {
- return mRoute;
- }
-
- /**
- * Gets the audio attributes which the client should use to stream audio
- * to the destination, or null if the route does not support live audio streaming.
- */
- public @Nullable AudioAttributes getAudioAttributes() {
- return mAudioAttributes;
- }
-
- /**
- * Gets the display which the client should use to stream video to the
- * destination using a {@link Presentation}, or null if the route does not
- * support live video streaming.
- */
- public @Nullable Display getPresentationDisplay() {
- return mPresentationDisplay;
- }
-
- /**
- * Gets the route's volume provider, or null if none.
- */
- public @Nullable VolumeProvider getVolumeProvider() {
- return mVolumeProvider;
- }
-
- /**
- * Gets the set of supported route features.
- */
- public @RouteFeatures int getFeatures() {
- return mRoute.getFeatures();
- }
-
- /**
- * Gets the list of supported route protocols.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @NonNull List<String> getProtocols() {
- return mRoute.getProtocols();
- }
-
- /**
- * Gets an instance of a route protocol object that wraps the protocol binder
- * and provides easy access to the protocol's functionality.
- * <p>
- * This is a convenience method which invokes {@link #getProtocolBinder(String)}
- * using the name of the provided class then passes the resulting {@link IBinder}
- * to a single-argument constructor of that class.
- * </p><p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- @SuppressWarnings("unchecked")
- public @Nullable <T> T getProtocolObject(Class<T> clazz) {
- int index = getProtocols().indexOf(clazz.getName());
- if (index < 0) {
- return null;
- }
- if (mProtocolInstances[index] == null && mProtocolBinders[index] != null) {
- final Constructor<T> ctor;
- try {
- ctor = clazz.getConstructor(MEDIA_ROUTE_PROTOCOL_CTOR_PARAMETERS);
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException("Could not find public constructor "
- + "with IBinder argument in protocol class: " + clazz.getName(), ex);
- }
- try {
- mProtocolInstances[index] = ctor.newInstance(mProtocolBinders[index]);
- } catch (InstantiationException | IllegalAccessException
- | InvocationTargetException ex) {
- throw new RuntimeException("Could create instance of protocol class: "
- + clazz.getName(), ex);
- }
- }
- return (T)mProtocolInstances[index];
- }
-
- /**
- * Gets the {@link IBinder} that provides access to the specified route protocol
- * or null if the protocol is not supported.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @Nullable IBinder getProtocolBinder(@NonNull String name) {
- int index = getProtocols().indexOf(name);
- return index >= 0 ? mProtocolBinders[index] : null;
- }
-
- /**
- * Gets the {@link IBinder} that provides access to the specified route protocol
- * at the given index in the protocol list or null if the protocol is not supported.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @Nullable IBinder getProtocolBinder(int index) {
- return mProtocolBinders[index];
- }
-
- /**
- * Gets optional extra media route service or protocol specific information about
- * the connection. Use the service or protocol name as the prefix for
- * any extras to avoid namespace collisions.
- */
- public @Nullable Bundle getExtras() {
- return mExtras;
- }
-
- /**
- * Closes all closeables associated with the connection when the connection
- * is being torn down.
- */
- void close() {
- final int count = mCloseables.size();
- for (int i = 0; i < count; i++) {
- try {
- mCloseables.get(i).close();
- } catch (IOException ex) {
- }
- }
- }
-
- @Override
- public @NonNull String toString() {
- return "ConnectionInfo{ route=" + mRoute
- + ", audioAttributes=" + mAudioAttributes
- + ", presentationDisplay=" + mPresentationDisplay
- + ", volumeProvider=" + mVolumeProvider
- + ", protocolBinders=" + mProtocolBinders + " }";
- }
-
- /**
- * Builds {@link ConnectionInfo} objects.
- */
- public static final class Builder {
- private final RouteInfo mRoute;
- private AudioAttributes mAudioAttributes;
- private Display mPresentationDisplay;
- private VolumeProvider mVolumeProvider;
- private final IBinder[] mProtocols;
- private Bundle mExtras;
- private final ArrayList<Closeable> mCloseables = new ArrayList<Closeable>();
-
- /**
- * Creates a builder for connection information.
- *
- * @param route The route that is connected.
- */
- public Builder(@NonNull RouteInfo route) {
- if (route == null) {
- throw new IllegalArgumentException("route");
- }
- mRoute = route;
- mProtocols = new IBinder[route.getProtocols().size()];
- }
-
- /**
- * Sets the audio attributes which the client should use to stream audio
- * to the destination, or null if the route does not support live audio streaming.
- */
- public @NonNull Builder setAudioAttributes(
- @Nullable AudioAttributes audioAttributes) {
- mAudioAttributes = audioAttributes;
- return this;
- }
-
- /**
- * Sets the display which the client should use to stream video to the
- * destination using a {@link Presentation}, or null if the route does not
- * support live video streaming.
- */
- public @NonNull Builder setPresentationDisplay(@Nullable Display display) {
- mPresentationDisplay = display;
- return this;
- }
-
- /**
- * Sets the route's volume provider, or null if none.
- */
- public @NonNull Builder setVolumeProvider(@Nullable VolumeProvider provider) {
- mVolumeProvider = provider;
- return this;
- }
-
- /**
- * Sets the binder stub of a supported route protocol using
- * the protocol's fully qualified class name. The protocol must be one
- * of those that was indicated as being supported by the route.
- * <p>
- * If the stub implements {@link Closeable} then it will automatically
- * be closed when the client disconnects from the route.
- * </p><p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @NonNull Builder setProtocolStub(@NonNull Class<?> clazz,
- @NonNull IInterface stub) {
- if (clazz == null) {
- throw new IllegalArgumentException("clazz must not be null");
- }
- if (stub == null) {
- throw new IllegalArgumentException("stub must not be null");
- }
- if (stub instanceof Closeable) {
- mCloseables.add((Closeable)stub);
- }
- return setProtocolBinder(clazz.getName(), stub.asBinder());
- }
-
- /**
- * Sets the binder interface of a supported route protocol by name.
- * The protocol must be one of those that was indicated as being supported
- * by the route.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @NonNull Builder setProtocolBinder(@NonNull String name,
- @NonNull IBinder binder) {
- if (TextUtils.isEmpty(name)) {
- throw new IllegalArgumentException("name must not be null or empty");
- }
- if (binder == null) {
- throw new IllegalArgumentException("binder must not be null");
- }
- int index = mRoute.getProtocols().indexOf(name);
- if (index < 0) {
- throw new IllegalArgumentException("name must specify a protocol that "
- + "the route actually declared that it supports: "
- + "name=" + name + ", protocols=" + mRoute.getProtocols());
- }
- mProtocols[index] = binder;
- return this;
- }
-
- /**
- * Sets optional extra media route service or protocol specific information about
- * the connection. Use the service or protocol name as the prefix for
- * any extras to avoid namespace collisions.
- */
- public @NonNull Builder setExtras(@Nullable Bundle extras) {
- mExtras = extras;
- return this;
- }
-
- /**
- * Builds the {@link ConnectionInfo} object.
- */
- public @NonNull ConnectionInfo build() {
- return new ConnectionInfo(mRoute,
- mAudioAttributes, mPresentationDisplay,
- mVolumeProvider, mProtocols, mExtras, mCloseables);
- }
- }
- }
-
- /**
- * Describes one particular way of routing media content to a destination
- * according to the capabilities specified by a media route selector on behalf
- * of an application.
- */
- public static final class RouteInfo {
- private final String mId;
- private final DestinationInfo mDestination;
- private final MediaRouteSelector mSelector;
- private final int mFeatures;
- private final ArrayList<String> mProtocols;
- private final Bundle mExtras;
-
- RouteInfo(String id, DestinationInfo destination, MediaRouteSelector selector,
- int features, ArrayList<String> protocols, Bundle extras) {
- mId = id;
- mDestination = destination;
- mSelector = selector;
- mFeatures = features;
- mProtocols = protocols;
- mExtras = extras;
- }
-
- /**
- * Gets the route's stable identifier.
- * <p>
- * The id is intended to uniquely identify the route among all routes that
- * are offered by a particular destination in such a way that the client can
- * refer to it at a later time.
- * </p>
- */
- public @NonNull String getId() {
- return mId;
- }
-
- /**
- * Gets the destination that is offering this route.
- */
- public @NonNull DestinationInfo getDestination() {
- return mDestination;
- }
-
- /**
- * Gets the media route selector provided by the client for which this
- * route was created.
- * <p>
- * It is implied that this route supports all of the required capabilities
- * that were expressed in the selector.
- * </p>
- */
- public @NonNull MediaRouteSelector getSelector() {
- return mSelector;
- }
-
- /**
- * Gets the set of supported route features.
- */
- public @RouteFeatures int getFeatures() {
- return mFeatures;
- }
-
- /**
- * Gets the list of supported route protocols.
- * <p>
- * Refer to <code>android.support.media.protocols.MediaRouteProtocol</code>
- * for more information.
- * </p>
- */
- public @NonNull List<String> getProtocols() {
- return mProtocols;
- }
-
- /**
- * Gets optional extra information about the route, or null if none.
- */
- public @Nullable Bundle getExtras() {
- return mExtras;
- }
-
- @Override
- public @NonNull String toString() {
- return "RouteInfo{ id=" + mId + ", destination=" + mDestination
- + ", features=0x" + Integer.toHexString(mFeatures)
- + ", selector=" + mSelector + ", protocols=" + mProtocols
- + ", extras=" + mExtras + " }";
- }
-
- /**
- * Builds {@link RouteInfo} objects.
- */
- public static final class Builder {
- private final DestinationInfo mDestination;
- private final String mId;
- private final MediaRouteSelector mSelector;
- private int mFeatures;
- private final ArrayList<String> mProtocols = new ArrayList<String>();
- private Bundle mExtras;
-
- /**
- * Creates a builder for route information.
- *
- * @param id The route's stable identifier.
- * @param destination The destination of this route.
- * @param selector The media route selector provided by the client for which
- * this route was created. This must be one of the selectors that was
- * included in the discovery request.
- */
- public Builder(@NonNull String id, @NonNull DestinationInfo destination,
- @NonNull MediaRouteSelector selector) {
- if (TextUtils.isEmpty(id)) {
- throw new IllegalArgumentException("id must not be null or empty");
- }
- if (destination == null) {
- throw new IllegalArgumentException("destination must not be null");
- }
- if (selector == null) {
- throw new IllegalArgumentException("selector must not be null");
- }
- mDestination = destination;
- mId = id;
- mSelector = selector;
- }
-
- /**
- * Sets the set of supported route features.
- */
- public @NonNull Builder setFeatures(@RouteFeatures int features) {
- mFeatures = features;
- return this;
- }
-
- /**
- * Adds a supported route protocol using its fully qualified class name.
- * <p>
- * If the protocol was not requested by the client in its selector
- * then it will be silently discarded.
- * </p>
- */
- public @NonNull <T extends IInterface> Builder addProtocol(@NonNull Class<T> clazz) {
- if (clazz == null) {
- throw new IllegalArgumentException("clazz must not be null");
- }
- return addProtocol(clazz.getName());
- }
-
- /**
- * Adds a supported route protocol by name.
- * <p>
- * If the protocol was not requested by the client in its selector
- * then it will be silently discarded.
- * </p>
- */
- public @NonNull Builder addProtocol(@NonNull String name) {
- if (TextUtils.isEmpty(name)) {
- throw new IllegalArgumentException("name must not be null");
- }
- if (mSelector.containsProtocol(name)) {
- mProtocols.add(name);
- }
- return this;
- }
-
- /**
- * Sets optional extra information about the route, or null if none.
- */
- public @NonNull Builder setExtras(@Nullable Bundle extras) {
- mExtras = extras;
- return this;
- }
-
- /**
- * Builds the {@link RouteInfo} object.
- * <p>
- * Ensures that all required protocols have been supplied.
- * </p>
- */
- public @NonNull RouteInfo build() {
- int missingFeatures = mSelector.getRequiredFeatures() & ~mFeatures;
- if (missingFeatures != 0) {
- throw new IllegalStateException("The media route selector "
- + "specified required features which this route does "
- + "not appear to support so it should not have been published: "
- + "missing 0x" + Integer.toHexString(missingFeatures));
- }
- for (String protocol : mSelector.getRequiredProtocols()) {
- if (!mProtocols.contains(protocol)) {
- throw new IllegalStateException("The media route selector "
- + "specified required protocols which this route "
- + "does not appear to support so it should not have "
- + "been published: missing " + protocol);
- }
- }
- return new RouteInfo(mId, mDestination, mSelector,
- mFeatures, mProtocols, mExtras);
- }
- }
- }
-
- /**
- * Describes a destination for media content such as a device,
- * an individual port on a device, or a group of devices.
- */
- public static final class DestinationInfo {
- private final String mId;
- private final ServiceMetadata mService;
- private final CharSequence mName;
- private final CharSequence mDescription;
- private final int mIconResourceId;
- private final Bundle mExtras;
-
- DestinationInfo(String id, ServiceMetadata service,
- CharSequence name, CharSequence description,
- int iconResourceId, Bundle extras) {
- mId = id;
- mService = service;
- mName = name;
- mDescription = description;
- mIconResourceId = iconResourceId;
- mExtras = extras;
- }
-
- /**
- * Gets the destination's stable identifier.
- * <p>
- * The id is intended to uniquely identify the destination among all destinations
- * provided by the media route service in such a way that the client can
- * refer to it at a later time. Ideally, the id should be resilient to
- * user-initiated actions such as changes to the name or description
- * of the destination.
- * </p>
- */
- public @NonNull String getId() {
- return mId;
- }
-
- /**
- * Gets metadata about the service that is providing access to this destination.
- */
- public @NonNull ServiceMetadata getServiceMetadata() {
- return mService;
- }
-
- /**
- * Gets the destination's name for display to the user.
- */
- public @NonNull CharSequence getName() {
- return mName;
- }
-
- /**
- * Gets the destination's description for display to the user, or null if none.
- */
- public @Nullable CharSequence getDescription() {
- return mDescription;
- }
-
- /**
- * Gets an icon resource from the service's package which is used
- * to identify the destination, or -1 if none.
- */
- public @DrawableRes int getIconResourceId() {
- return mIconResourceId;
- }
-
- /**
- * Loads the icon drawable, or null if none.
- */
- public @Nullable Drawable loadIcon(@NonNull PackageManager pm) {
- return mIconResourceId >= 0 ? mService.getDrawable(pm, mIconResourceId) : null;
- }
-
- /**
- * Gets optional extra information about the destination, or null if none.
- */
- public @Nullable Bundle getExtras() {
- return mExtras;
- }
-
- @Override
- public @NonNull String toString() {
- return "DestinationInfo{ id=" + mId + ", service=" + mService + ", name=" + mName
- + ", description=" + mDescription + ", iconResourceId=" + mIconResourceId
- + ", extras=" + mExtras + " }";
- }
-
- /**
- * Builds {@link DestinationInfo} objects.
- */
- public static final class Builder {
- private final String mId;
- private final ServiceMetadata mService;
- private final CharSequence mName;
- private CharSequence mDescription;
- private int mIconResourceId = -1;
- private Bundle mExtras;
-
- /**
- * Creates a builder for destination information.
- *
- * @param id The destination's stable identifier.
- * @param service Metatada about the service that is providing access to
- * this destination.
- * @param name The destination's name for display to the user.
- */
- public Builder(@NonNull String id, @NonNull ServiceMetadata service,
- @NonNull CharSequence name) {
- if (TextUtils.isEmpty(id)) {
- throw new IllegalArgumentException("id must not be null or empty");
- }
- if (service == null) {
- throw new IllegalArgumentException("service must not be null");
- }
- if (TextUtils.isEmpty(name)) {
- throw new IllegalArgumentException("name must not be null or empty");
- }
- mId = id;
- mService = service;
- mName = name;
- }
-
- /**
- * Sets the destination's description for display to the user, or null if none.
- */
- public @NonNull Builder setDescription(@Nullable CharSequence description) {
- mDescription = description;
- return this;
- }
-
- /**
- * Sets an icon resource from this package used to identify the destination,
- * or -1 if none.
- */
- public @NonNull Builder setIconResourceId(@DrawableRes int resid) {
- mIconResourceId = resid;
- return this;
- }
-
- /**
- * Gets optional extra information about the destination, or null if none.
- */
- public @NonNull Builder setExtras(@Nullable Bundle extras) {
- mExtras = extras;
- return this;
- }
-
- /**
- * Builds the {@link DestinationInfo} object.
- */
- public @NonNull DestinationInfo build() {
- return new DestinationInfo(mId, mService, mName, mDescription,
- mIconResourceId, mExtras);
- }
- }
- }
-
- /**
- * Describes metadata about a {@link MediaRouteService} which is providing
- * access to certain kinds of destinations.
- */
- public static final class ServiceMetadata {
- private final ServiceInfo mService;
- private CharSequence mLabel;
- private Drawable mIcon;
-
- ServiceMetadata(Service service) throws NameNotFoundException {
- mService = service.getPackageManager().getServiceInfo(
- new ComponentName(service, service.getClass()),
- PackageManager.GET_META_DATA);
- }
-
- ServiceMetadata(ServiceInfo service) {
- mService = service;
- }
-
- /**
- * Gets the service's component information including it name, label and icon.
- */
- public @NonNull ServiceInfo getService() {
- return mService;
- }
-
- /**
- * Gets the service's component name.
- */
- public @NonNull ComponentName getComponentName() {
- return new ComponentName(mService.packageName, mService.name);
- }
-
- /**
- * Gets the service's package name.
- */
- public @NonNull String getPackageName() {
- return mService.packageName;
- }
-
- /**
- * Gets the service's name for display to the user, or null if none.
- */
- public @NonNull CharSequence getLabel(@NonNull PackageManager pm) {
- if (mLabel == null) {
- mLabel = mService.loadLabel(pm);
- }
- return mLabel;
- }
-
- /**
- * Gets the icon drawable, or null if none.
- */
- public @Nullable Drawable getIcon(@NonNull PackageManager pm) {
- if (mIcon == null) {
- mIcon = mService.loadIcon(pm);
- }
- return mIcon;
- }
-
- // TODO: add service metadata
-
- Drawable getDrawable(PackageManager pm, int resid) {
- return pm.getDrawable(getPackageName(), resid, mService.applicationInfo);
- }
-
- @Override
- public @NonNull String toString() {
- return "ServiceInfo{ service=" + getComponentName().toShortString() + " }";
- }
- }
-
- /**
- * Describes a request to discover routes on behalf of an application.
- */
- public static final class DiscoveryRequest {
- private final ArrayList<MediaRouteSelector> mSelectors =
- new ArrayList<MediaRouteSelector>();
- private int mFlags;
-
- DiscoveryRequest(@NonNull List<MediaRouteSelector> selectors) {
- setSelectors(selectors);
- }
-
- /**
- * Sets the list of media route selectors to consider during discovery.
- */
- public void setSelectors(@NonNull List<MediaRouteSelector> selectors) {
- if (selectors == null) {
- throw new IllegalArgumentException("selectors");
- }
- mSelectors.clear();
- mSelectors.addAll(selectors);
- }
-
- /**
- * Gets the list of media route selectors to consider during discovery.
- */
- public @NonNull List<MediaRouteSelector> getSelectors() {
- return mSelectors;
- }
-
- /**
- * Gets discovery flags, such as {@link MediaRouter#DISCOVERY_FLAG_BACKGROUND}.
- */
- public @DiscoveryFlags int getFlags() {
- return mFlags;
- }
-
- /**
- * Sets discovery flags, such as {@link MediaRouter#DISCOVERY_FLAG_BACKGROUND}.
- */
- public void setFlags(@DiscoveryFlags int flags) {
- mFlags = flags;
- }
-
- @Override
- public @NonNull String toString() {
- return "DiscoveryRequest{ selectors=" + mSelectors
- + ", flags=0x" + Integer.toHexString(mFlags)
- + " }";
- }
- }
-
- /**
- * Describes a request to connect to a previously discovered route on
- * behalf of an application.
- */
- public static final class ConnectionRequest {
- private RouteInfo mRoute;
- private int mFlags;
- private Bundle mExtras;
-
- ConnectionRequest(@NonNull RouteInfo route) {
- setRoute(route);
- }
-
- /**
- * Gets the route to which to connect.
- */
- public @NonNull RouteInfo getRoute() {
- return mRoute;
- }
-
- /**
- * Sets the route to which to connect.
- */
- public void setRoute(@NonNull RouteInfo route) {
- if (route == null) {
- throw new IllegalArgumentException("route must not be null");
- }
- mRoute = route;
- }
-
- /**
- * Gets connection flags, such as {@link MediaRouter#CONNECTION_FLAG_BARGE}.
- */
- public @ConnectionFlags int getFlags() {
- return mFlags;
- }
-
- /**
- * Sets connection flags, such as {@link MediaRouter#CONNECTION_FLAG_BARGE}.
- */
- public void setFlags(@ConnectionFlags int flags) {
- mFlags = flags;
- }
-
- /**
- * Gets optional extras supplied by the application as part of the call to
- * connect, or null if none. The media route service may use this
- * information to configure the route during connection.
- */
- public @Nullable Bundle getExtras() {
- return mExtras;
- }
-
- /**
- * Sets optional extras supplied by the application as part of the call to
- * connect, or null if none. The media route service may use this
- * information to configure the route during connection.
- */
- public void setExtras(@Nullable Bundle extras) {
- mExtras = extras;
- }
-
- @Override
- public @NonNull String toString() {
- return "ConnectionRequest{ route=" + mRoute
- + ", flags=0x" + Integer.toHexString(mFlags)
- + ", extras=" + mExtras + " }";
- }
- }
-
- /**
- * Callback interface to specify policy for route discovery, filtering,
- * and connection establishment as well as observe media router state changes.
- */
- public static abstract class RoutingCallback extends StateCallback {
- /**
- * Called to prepare a discovery request object to specify the desired
- * media route selectors when the media router has been asked to start discovery.
- * <p>
- * By default, the discovery request contains all of the selectors which
- * have been added to the media router. Subclasses may override the list of
- * selectors by modifying the discovery request object before returning.
- * </p>
- *
- * @param request The discovery request object which may be modified by
- * this method to alter how discovery will be performed.
- * @param selectors The immutable list of media route selectors which were
- * added to the media router.
- * @return True to allow discovery to proceed or false to abort it.
- * By default, this methods returns true.
- */
- public boolean onPrepareDiscoveryRequest(@NonNull DiscoveryRequest request,
- @NonNull List<MediaRouteSelector> selectors) {
- return true;
- }
-
- /**
- * Called to prepare a connection request object to specify the desired
- * route and connection parameters when the media router has been asked to
- * connect to a particular destination.
- * <p>
- * By default, the connection request specifies the first available route
- * to the destination. Subclasses may override the route and destination
- * or set additional connection parameters by modifying the connection request
- * object before returning.
- * </p>
- *
- * @param request The connection request object which may be modified by
- * this method to alter how the connection will be established.
- * @param destination The destination to which the media router was asked
- * to connect.
- * @param routes The list of routes that belong to that destination sorted
- * in the same order as their matching media route selectors which were
- * used during discovery.
- * @return True to allow the connection to proceed or false to abort it.
- * By default, this methods returns true.
- */
- public boolean onPrepareConnectionRequest(
- @NonNull ConnectionRequest request,
- @NonNull DestinationInfo destination, @NonNull List<RouteInfo> routes) {
- return true;
- }
- }
-
- /**
- * Callback class to receive events from a {@link MediaRouter.Delegate}.
- */
- public static abstract class StateCallback {
- /**
- * Called when the media router has been released.
- */
- public void onReleased() { }
-
- /**
- * Called when the discovery state has changed.
- *
- * @param state The new discovery state: one of
- * {@link #DISCOVERY_STATE_STOPPED} or {@link #DISCOVERY_STATE_STARTED}.
- */
- public void onDiscoveryStateChanged(@DiscoveryState int state) { }
-
- /**
- * Called when the connection state has changed.
- *
- * @param state The new connection state: one of
- * {@link #CONNECTION_STATE_DISCONNECTED}, {@link #CONNECTION_STATE_CONNECTING}
- * or {@link #CONNECTION_STATE_CONNECTED}.
- */
- public void onConnectionStateChanged(@ConnectionState int state) { }
-
- /**
- * Called when the selected destination has changed.
- *
- * @param destination The new selected destination, or null if none.
- */
- public void onSelectedDestinationChanged(@Nullable DestinationInfo destination) { }
-
- /**
- * Called when route discovery has started.
- */
- public void onDiscoveryStarted() { }
-
- /**
- * Called when route discovery has stopped normally.
- * <p>
- * Abnormal termination is reported via {@link #onDiscoveryFailed}.
- * </p>
- */
- public void onDiscoveryStopped() { }
-
- /**
- * Called when discovery has failed in a non-recoverable manner.
- *
- * @param error The error code: one of
- * {@link MediaRouter#DISCOVERY_ERROR_UNKNOWN},
- * {@link MediaRouter#DISCOVERY_ERROR_ABORTED},
- * or {@link MediaRouter#DISCOVERY_ERROR_NO_CONNECTIVITY}.
- * @param message The localized error message, or null if none. This message
- * may be shown to the user.
- * @param extras Additional information about the error which a client
- * may use, or null if none.
- */
- public void onDiscoveryFailed(@DiscoveryError int error, @Nullable CharSequence message,
- @Nullable Bundle extras) { }
-
- /**
- * Called when a new destination is found or has changed during discovery.
- * <p>
- * Certain destinations may be omitted because they have been filtered
- * out by the media router's routing callback.
- * </p>
- *
- * @param destination The destination that was found.
- */
- public void onDestinationFound(@NonNull DestinationInfo destination) { }
-
- /**
- * Called when a destination is no longer reachable or is no longer
- * offering any routes that satisfy the discovery request.
- *
- * @param destination The destination that went away.
- */
- public void onDestinationLost(@NonNull DestinationInfo destination) { }
-
- /**
- * Called when a connection attempt begins.
- */
- public void onConnecting() { }
-
- /**
- * Called when the connection succeeds.
- */
- public void onConnected() { }
-
- /**
- * Called when the connection is terminated normally.
- * <p>
- * Abnormal termination is reported via {@link #onConnectionFailed}.
- * </p>
- */
- public void onDisconnected() { }
-
- /**
- * Called when a connection attempt or connection in
- * progress has failed in a non-recoverable manner.
- *
- * @param error The error code: one of
- * {@link MediaRouter#CONNECTION_ERROR_ABORTED},
- * {@link MediaRouter#CONNECTION_ERROR_UNAUTHORIZED},
- * {@link MediaRouter#CONNECTION_ERROR_UNREACHABLE},
- * {@link MediaRouter#CONNECTION_ERROR_BUSY},
- * {@link MediaRouter#CONNECTION_ERROR_TIMEOUT},
- * {@link MediaRouter#CONNECTION_ERROR_BROKEN},
- * or {@link MediaRouter#CONNECTION_ERROR_BARGED}.
- * @param message The localized error message, or null if none. This message
- * may be shown to the user.
- * @param extras Additional information about the error which a client
- * may use, or null if none.
- */
- public void onConnectionFailed(@ConnectionError int error,
- @Nullable CharSequence message, @Nullable Bundle extras) { }
- }
-}
diff --git a/media/java/android/media/routing/ParcelableConnectionInfo.aidl b/media/java/android/media/routing/ParcelableConnectionInfo.aidl
deleted file mode 100644
index 4a9ec94..0000000
--- a/media/java/android/media/routing/ParcelableConnectionInfo.aidl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.media.routing;
-
-parcelable ParcelableConnectionInfo;
diff --git a/media/java/android/media/routing/ParcelableConnectionInfo.java b/media/java/android/media/routing/ParcelableConnectionInfo.java
deleted file mode 100644
index 45cfe9f..0000000
--- a/media/java/android/media/routing/ParcelableConnectionInfo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.media.AudioAttributes;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Internal parcelable representation of a media route connection.
- */
-class ParcelableConnectionInfo implements Parcelable {
- public AudioAttributes audioAttributes;
- public int presentationDisplayId = -1;
- // todo: volume
- public IBinder[] protocolBinders;
- public Bundle extras;
-
- public static final Parcelable.Creator<ParcelableConnectionInfo> CREATOR =
- new Parcelable.Creator<ParcelableConnectionInfo>() {
- @Override
- public ParcelableConnectionInfo createFromParcel(Parcel source) {
- ParcelableConnectionInfo info = new ParcelableConnectionInfo();
- if (source.readInt() != 0) {
- info.audioAttributes = AudioAttributes.CREATOR.createFromParcel(source);
- }
- info.presentationDisplayId = source.readInt();
- info.protocolBinders = source.createBinderArray();
- info.extras = source.readBundle();
- return info;
- }
-
- @Override
- public ParcelableConnectionInfo[] newArray(int size) {
- return new ParcelableConnectionInfo[size];
- }
- };
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- if (audioAttributes != null) {
- dest.writeInt(1);
- audioAttributes.writeToParcel(dest, flags);
- } else {
- dest.writeInt(0);
- }
- dest.writeInt(presentationDisplayId);
- dest.writeBinderArray(protocolBinders);
- dest.writeBundle(extras);
- }
-}
diff --git a/media/java/android/media/routing/ParcelableDestinationInfo.java b/media/java/android/media/routing/ParcelableDestinationInfo.java
deleted file mode 100644
index eca5eec..0000000
--- a/media/java/android/media/routing/ParcelableDestinationInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-/**
- * Internal parcelable representation of a media destination.
- */
-class ParcelableDestinationInfo implements Parcelable {
- public String id;
- public CharSequence name;
- public CharSequence description;
- public int iconResourceId;
- public Bundle extras;
-
- public static final Parcelable.Creator<ParcelableDestinationInfo> CREATOR =
- new Parcelable.Creator<ParcelableDestinationInfo>() {
- @Override
- public ParcelableDestinationInfo createFromParcel(Parcel source) {
- ParcelableDestinationInfo info = new ParcelableDestinationInfo();
- info.id = source.readString();
- info.name = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
- info.description = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
- info.iconResourceId = source.readInt();
- info.extras = source.readBundle();
- return info;
- }
-
- @Override
- public ParcelableDestinationInfo[] newArray(int size) {
- return new ParcelableDestinationInfo[size];
- }
- };
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(id);
- TextUtils.writeToParcel(name, dest, flags);
- TextUtils.writeToParcel(description, dest, flags);
- dest.writeInt(iconResourceId);
- dest.writeBundle(extras);
- }
-}
diff --git a/media/java/android/media/routing/ParcelableRouteInfo.aidl b/media/java/android/media/routing/ParcelableRouteInfo.aidl
deleted file mode 100644
index 126afaa..0000000
--- a/media/java/android/media/routing/ParcelableRouteInfo.aidl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.media.routing;
-
-parcelable ParcelableRouteInfo;
diff --git a/media/java/android/media/routing/ParcelableRouteInfo.java b/media/java/android/media/routing/ParcelableRouteInfo.java
deleted file mode 100644
index fb1a547..0000000
--- a/media/java/android/media/routing/ParcelableRouteInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.routing;
-
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Internal parcelable representation of a media route.
- */
-class ParcelableRouteInfo implements Parcelable {
- public String id;
- public int selectorIndex; // index of selector within list used for discovery
- public int features;
- public String[] protocols;
- public Bundle extras;
-
- public static final Parcelable.Creator<ParcelableRouteInfo> CREATOR =
- new Parcelable.Creator<ParcelableRouteInfo>() {
- @Override
- public ParcelableRouteInfo createFromParcel(Parcel source) {
- ParcelableRouteInfo info = new ParcelableRouteInfo();
- info.id = source.readString();
- info.selectorIndex = source.readInt();
- info.features = source.readInt();
- info.protocols = source.createStringArray();
- info.extras = source.readBundle();
- return info;
- }
-
- @Override
- public ParcelableRouteInfo[] newArray(int size) {
- return new ParcelableRouteInfo[size];
- }
- };
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(id);
- dest.writeInt(selectorIndex);
- dest.writeInt(features);
- dest.writeStringArray(protocols);
- dest.writeBundle(extras);
- }
-}
diff --git a/media/java/android/media/session/ISession.aidl b/media/java/android/media/session/ISession.aidl
index af3b72e..bd0019f 100644
--- a/media/java/android/media/session/ISession.aidl
+++ b/media/java/android/media/session/ISession.aidl
@@ -19,7 +19,6 @@
import android.content.pm.ParceledListSlice;
import android.media.AudioAttributes;
import android.media.MediaMetadata;
-import android.media.routing.IMediaRouter;
import android.media.session.ISessionController;
import android.media.session.PlaybackState;
import android.media.session.MediaSession;
@@ -35,7 +34,6 @@
ISessionController getController();
void setFlags(int flags);
void setActive(boolean active);
- void setMediaRouter(in IMediaRouter router);
void setMediaButtonReceiver(in PendingIntent mbr);
void setLaunchPendingIntent(in PendingIntent pi);
void destroy();
diff --git a/media/java/android/media/session/ISessionController.aidl b/media/java/android/media/session/ISessionController.aidl
index 3518458..6b80477 100644
--- a/media/java/android/media/session/ISessionController.aidl
+++ b/media/java/android/media/session/ISessionController.aidl
@@ -20,8 +20,6 @@
import android.content.pm.ParceledListSlice;
import android.media.MediaMetadata;
import android.media.Rating;
-import android.media.routing.IMediaRouterDelegate;
-import android.media.routing.IMediaRouterStateCallback;
import android.media.session.ISessionControllerCallback;
import android.media.session.ParcelableVolumeInfo;
import android.media.session.PlaybackState;
@@ -48,10 +46,8 @@
PendingIntent getLaunchPendingIntent();
long getFlags();
ParcelableVolumeInfo getVolumeAttributes();
- void adjustVolume(int direction, int flags);
- void setVolumeTo(int value, int flags);
-
- IMediaRouterDelegate createMediaRouterDelegate(IMediaRouterStateCallback callback);
+ void adjustVolume(int direction, int flags, String packageName);
+ void setVolumeTo(int value, int flags, String packageName);
// These commands are for the TransportControls
void play();
diff --git a/media/java/android/media/session/ISessionControllerCallback.aidl b/media/java/android/media/session/ISessionControllerCallback.aidl
index 78cd699..cf31767 100644
--- a/media/java/android/media/session/ISessionControllerCallback.aidl
+++ b/media/java/android/media/session/ISessionControllerCallback.aidl
@@ -27,6 +27,7 @@
*/
oneway interface ISessionControllerCallback {
void onEvent(String event, in Bundle extras);
+ void onSessionDestroyed();
// These callbacks are for the TransportController
void onPlaybackStateChanged(in PlaybackState state);
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index f6e189a..d7baaa9 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -26,7 +26,6 @@
import android.media.MediaMetadata;
import android.media.Rating;
import android.media.VolumeProvider;
-import android.media.routing.MediaRouter;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -63,6 +62,7 @@
private static final int MSG_UPDATE_QUEUE = 5;
private static final int MSG_UPDATE_QUEUE_TITLE = 6;
private static final int MSG_UPDATE_EXTRAS = 7;
+ private static final int MSG_DESTROYED = 8;
private final ISessionController mSessionBinder;
@@ -118,17 +118,6 @@
}
/**
- * Creates a media router delegate through which the destination of the media
- * router may be observed and controlled.
- *
- * @return The media router delegate, or null if the media session does
- * not support media routing.
- */
- public @Nullable MediaRouter.Delegate createMediaRouterDelegate() {
- return new MediaRouter.Delegate();
- }
-
- /**
* Send the specified media button event to the session. Only media keys can
* be sent by this method, other keys will be ignored.
*
@@ -184,7 +173,7 @@
*
* @return The current play queue or null.
*/
- public @Nullable List<MediaSession.Track> getQueue() {
+ public @Nullable List<MediaSession.Item> getQueue() {
try {
ParceledListSlice queue = mSessionBinder.getQueue();
if (queue != null) {
@@ -258,18 +247,18 @@
}
/**
- * Get the current volume info for this session.
+ * Get the current playback info for this session.
*
- * @return The current volume info or null.
+ * @return The current playback info or null.
*/
- public @Nullable VolumeInfo getVolumeInfo() {
+ public @Nullable PlaybackInfo getPlaybackInfo() {
try {
ParcelableVolumeInfo result = mSessionBinder.getVolumeAttributes();
- return new VolumeInfo(result.volumeType, result.audioAttrs, result.controlType,
+ return new PlaybackInfo(result.volumeType, result.audioAttrs, result.controlType,
result.maxVolume, result.currentVolume);
} catch (RemoteException e) {
- Log.wtf(TAG, "Error calling getVolumeInfo.", e);
+ Log.wtf(TAG, "Error calling getAudioInfo.", e);
}
return null;
}
@@ -280,7 +269,7 @@
*
* @return A {@link PendingIntent} to launch UI or null.
*/
- public @Nullable PendingIntent getLaunchActivity() {
+ public @Nullable PendingIntent getSessionActivity() {
try {
return mSessionBinder.getLaunchPendingIntent();
} catch (RemoteException e) {
@@ -304,13 +293,14 @@
* {@link VolumeProvider#VOLUME_CONTROL_ABSOLUTE}. The flags in
* {@link AudioManager} may be used to affect the handling.
*
- * @see #getVolumeInfo()
+ * @see #getPlaybackInfo()
* @param value The value to set it to, between 0 and the reported max.
- * @param flags Any flags to pass with the command.
+ * @param flags Flags from {@link AudioManager} to include with the volume
+ * request.
*/
public void setVolumeTo(int value, int flags) {
try {
- mSessionBinder.setVolumeTo(value, flags);
+ mSessionBinder.setVolumeTo(value, flags, mContext.getPackageName());
} catch (RemoteException e) {
Log.wtf(TAG, "Error calling setVolumeTo.", e);
}
@@ -325,13 +315,13 @@
* {@link VolumeProvider#VOLUME_CONTROL_ABSOLUTE}. The flags in
* {@link AudioManager} may be used to affect the handling.
*
- * @see #getVolumeInfo()
+ * @see #getPlaybackInfo()
* @param direction The direction to adjust the volume in.
* @param flags Any flags to pass with the command.
*/
public void adjustVolume(int direction, int flags) {
try {
- mSessionBinder.adjustVolume(direction, flags);
+ mSessionBinder.adjustVolume(direction, flags, mContext.getPackageName());
} catch (RemoteException e) {
Log.wtf(TAG, "Error calling adjustVolumeBy.", e);
}
@@ -508,6 +498,13 @@
*/
public static abstract class Callback {
/**
+ * Override to handle the session being destroyed. The session is no
+ * longer valid after this call and calls to it will be ignored.
+ */
+ public void onSessionDestroyed() {
+ }
+
+ /**
* Override to handle custom events sent by the session owner without a
* specified interface. Controllers should only handle these for
* sessions they own.
@@ -536,13 +533,14 @@
}
/**
- * Override to handle changes to tracks in the queue.
+ * Override to handle changes to items in the queue.
*
- * @param queue A list of tracks in the current play queue. It should include the currently
- * playing track as well as previous and upcoming tracks if applicable.
- * @see MediaSession.Track
+ * @param queue A list of items in the current play queue. It should
+ * include the currently playing item as well as previous and
+ * upcoming items if applicable.
+ * @see MediaSession.Item
*/
- public void onQueueChanged(@Nullable List<MediaSession.Track> queue) {
+ public void onQueueChanged(@Nullable List<MediaSession.Item> queue) {
}
/**
@@ -564,11 +562,11 @@
}
/**
- * Override to handle changes to the volume info.
+ * Override to handle changes to the audio info.
*
- * @param info The current volume info for this session.
+ * @param info The current audio info for this session.
*/
- public void onVolumeInfoChanged(VolumeInfo info) {
+ public void onAudioInfoChanged(PlaybackInfo info) {
}
}
@@ -630,14 +628,14 @@
}
/**
- * Play a track with a specific id in the play queue.
- * If you specify an id that is not in the play queue, the behavior is undefined.
+ * Play an item with a specific id in the play queue. If you specify an
+ * id that is not in the play queue, the behavior is undefined.
*/
- public void skipToTrack(long id) {
+ public void skipToItem(long id) {
try {
mSessionBinder.skipToTrack(id);
} catch (RemoteException e) {
- Log.wtf(TAG, "Error calling skipToTrack(" + id + ").", e);
+ Log.wtf(TAG, "Error calling skipToItem(" + id + ").", e);
}
}
@@ -776,9 +774,19 @@
}
/**
- * Holds information about the way volume is handled for this session.
+ * Holds information about the current playback and how audio is handled for
+ * this session.
*/
- public static final class VolumeInfo {
+ public static final class PlaybackInfo {
+ /**
+ * The session uses remote playback.
+ */
+ public static final int PLAYBACK_TYPE_REMOTE = 2;
+ /**
+ * The session uses local playback.
+ */
+ public static final int PLAYBACK_TYPE_LOCAL = 1;
+
private final int mVolumeType;
private final int mVolumeControl;
private final int mMaxVolume;
@@ -788,7 +796,7 @@
/**
* @hide
*/
- public VolumeInfo(int type, AudioAttributes attrs, int control, int max, int current) {
+ public PlaybackInfo(int type, AudioAttributes attrs, int control, int max, int current) {
mVolumeType = type;
mAudioAttrs = attrs;
mVolumeControl = control;
@@ -797,22 +805,22 @@
}
/**
- * Get the type of volume handling, either local or remote. One of:
+ * Get the type of playback which affects volume handling. One of:
* <ul>
- * <li>{@link MediaSession#PLAYBACK_TYPE_LOCAL}</li>
- * <li>{@link MediaSession#PLAYBACK_TYPE_REMOTE}</li>
+ * <li>{@link #PLAYBACK_TYPE_LOCAL}</li>
+ * <li>{@link #PLAYBACK_TYPE_REMOTE}</li>
* </ul>
*
- * @return The type of volume handling this session is using.
+ * @return The type of playback this session is using.
*/
- public int getVolumeType() {
+ public int getPlaybackType() {
return mVolumeType;
}
/**
* Get the audio attributes for this session. The attributes will affect
* volume handling for the session. When the volume type is
- * {@link MediaSession#PLAYBACK_TYPE_REMOTE} these may be ignored by the
+ * {@link PlaybackInfo#PLAYBACK_TYPE_REMOTE} these may be ignored by the
* remote volume handler.
*
* @return The attributes for this session.
@@ -863,6 +871,14 @@
}
@Override
+ public void onSessionDestroyed() {
+ MediaController controller = mController.get();
+ if (controller != null) {
+ controller.postMessage(MSG_DESTROYED, null, null);
+ }
+ }
+
+ @Override
public void onEvent(String event, Bundle extras) {
MediaController controller = mController.get();
if (controller != null) {
@@ -888,7 +904,7 @@
@Override
public void onQueueChanged(ParceledListSlice parceledQueue) {
- List<MediaSession.Track> queue = parceledQueue.getList();
+ List<MediaSession.Item> queue = parceledQueue.getList();
MediaController controller = mController.get();
if (controller != null) {
controller.postMessage(MSG_UPDATE_QUEUE, queue, null);
@@ -915,7 +931,7 @@
public void onVolumeInfoChanged(ParcelableVolumeInfo pvi) {
MediaController controller = mController.get();
if (controller != null) {
- VolumeInfo info = new VolumeInfo(pvi.volumeType, pvi.audioAttrs, pvi.controlType,
+ PlaybackInfo info = new PlaybackInfo(pvi.volumeType, pvi.audioAttrs, pvi.controlType,
pvi.maxVolume, pvi.currentVolume);
controller.postMessage(MSG_UPDATE_VOLUME, info, null);
}
@@ -944,7 +960,7 @@
mCallback.onMetadataChanged((MediaMetadata) msg.obj);
break;
case MSG_UPDATE_QUEUE:
- mCallback.onQueueChanged((List<MediaSession.Track>) msg.obj);
+ mCallback.onQueueChanged((List<MediaSession.Item>) msg.obj);
break;
case MSG_UPDATE_QUEUE_TITLE:
mCallback.onQueueTitleChanged((CharSequence) msg.obj);
@@ -953,7 +969,10 @@
mCallback.onExtrasChanged((Bundle) msg.obj);
break;
case MSG_UPDATE_VOLUME:
- mCallback.onVolumeInfoChanged((VolumeInfo) msg.obj);
+ mCallback.onAudioInfoChanged((PlaybackInfo) msg.obj);
+ break;
+ case MSG_DESTROYED:
+ mCallback.onSessionDestroyed();
break;
}
}
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index cf73c2a..eac6809 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -28,7 +28,6 @@
import android.media.MediaMetadata;
import android.media.Rating;
import android.media.VolumeProvider;
-import android.media.routing.MediaRouter;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -102,16 +101,6 @@
FLAG_EXCLUSIVE_GLOBAL_PRIORITY })
public @interface SessionFlags { }
- /**
- * The session uses local playback.
- */
- public static final int PLAYBACK_TYPE_LOCAL = 1;
-
- /**
- * The session uses remote playback.
- */
- public static final int PLAYBACK_TYPE_REMOTE = 2;
-
private final Object mLock = new Object();
private final MediaSession.Token mSessionToken;
@@ -216,7 +205,7 @@
*
* @param pi The intent to launch to show UI for this Session.
*/
- public void setLaunchActivity(@Nullable PendingIntent pi) {
+ public void setSessionActivity(@Nullable PendingIntent pi) {
try {
mBinder.setLaunchPendingIntent(pi);
} catch (RemoteException e) {
@@ -225,23 +214,6 @@
}
/**
- * Associates a {@link MediaRouter} with this session to control the destination
- * of media content.
- * <p>
- * A media router may only be associated with at most one session at a time.
- * </p>
- *
- * @param router The media router, or null to remove the current association.
- */
- public void setMediaRouter(@Nullable MediaRouter router) {
- try {
- mBinder.setMediaRouter(router != null ? router.getBinder() : null);
- } catch (RemoteException e) {
- Log.wtf(TAG, "Failure in setMediaButtonReceiver.", e);
- }
- }
-
- /**
* Set a pending intent for your media button receiver to allow restarting
* playback after the session has been stopped. If your app is started in
* this way an {@link Intent#ACTION_MEDIA_BUTTON} intent will be sent via
@@ -435,18 +407,19 @@
}
/**
- * Update the list of tracks in the play queue. It is an ordered list and should contain the
- * current track, and previous or upcoming tracks if they exist.
- * Specify null if there is no current play queue.
+ * Update the list of items in the play queue. It is an ordered list and
+ * should contain the current item, and previous or upcoming items if they
+ * exist. Specify null if there is no current play queue.
* <p>
- * The queue should be of reasonable size. If the play queue is unbounded within your
- * app, it is better to send a reasonable amount in a sliding window instead.
+ * The queue should be of reasonable size. If the play queue is unbounded
+ * within your app, it is better to send a reasonable amount in a sliding
+ * window instead.
*
- * @param queue A list of tracks in the play queue.
+ * @param queue A list of items in the play queue.
*/
- public void setQueue(@Nullable List<Track> queue) {
+ public void setQueue(@Nullable List<Item> queue) {
try {
- mBinder.setQueue(new ParceledListSlice<Track>(queue));
+ mBinder.setQueue(new ParceledListSlice<Item>(queue));
} catch (RemoteException e) {
Log.wtf("Dead object in setQueue.", e);
}
@@ -512,8 +485,8 @@
postToCallback(CallbackMessageHandler.MSG_PLAY_SEARCH, query, extras);
}
- private void dispatchSkipToTrack(long id) {
- postToCallback(CallbackMessageHandler.MSG_SKIP_TO_TRACK, id);
+ private void dispatchSkipToItem(long id) {
+ postToCallback(CallbackMessageHandler.MSG_SKIP_TO_ITEM, id);
}
private void dispatchPause() {
@@ -782,9 +755,10 @@
}
/**
- * Override to handle requests to play a track with a given id from the play queue.
+ * Override to handle requests to play an item with a given id from the
+ * play queue.
*/
- public void onSkipToTrack(long id) {
+ public void onSkipToItem(long id) {
}
/**
@@ -916,7 +890,7 @@
public void onSkipToTrack(long id) {
MediaSession session = mMediaSession.get();
if (session != null) {
- session.dispatchSkipToTrack(id);
+ session.dispatchSkipToItem(id);
}
}
@@ -1015,12 +989,12 @@
}
/**
- * A single track that is part of the play queue. It contains information necessary to display
- * a single track in the queue.
+ * A single item that is part of the play queue. It contains information
+ * necessary to display a single item in the queue.
*/
- public static final class Track implements Parcelable {
+ public static final class Item implements Parcelable {
/**
- * This id is reserved. No tracks can be explicitly asigned this id.
+ * This id is reserved. No items can be explicitly asigned this id.
*/
public static final int UNKNOWN_ID = -1;
@@ -1030,22 +1004,23 @@
private final Bundle mExtras;
/**
- * Create a new {@link MediaSession.Track}.
+ * Create a new {@link MediaSession.Item}.
*
- * @param metadata The metadata for this track.
- * @param id An identifier for this track. It must be unique within the play queue.
- * @param uri The uri for this track.
- * @param extras A bundle of extras that can be used to add extra information about the
- * track.
+ * @param metadata The metadata for this item.
+ * @param id An identifier for this item. It must be unique within the
+ * play queue.
+ * @param uri The uri for this item.
+ * @param extras A bundle of extras that can be used to add extra
+ * information about this item.
*/
- private Track(MediaMetadata metadata, long id, Uri uri, Bundle extras) {
+ private Item(MediaMetadata metadata, long id, Uri uri, Bundle extras) {
mMetadata = metadata;
mId = id;
mUri = uri;
mExtras = extras;
}
- private Track(Parcel in) {
+ private Item(Parcel in) {
mMetadata = MediaMetadata.CREATOR.createFromParcel(in);
mId = in.readLong();
mUri = Uri.CREATOR.createFromParcel(in);
@@ -1053,35 +1028,35 @@
}
/**
- * Get the metadata for this track.
+ * Get the metadata for this item.
*/
public MediaMetadata getMetadata() {
return mMetadata;
}
/**
- * Get the id for this track.
+ * Get the id for this item.
*/
public long getId() {
return mId;
}
/**
- * Get the Uri for this track.
+ * Get the Uri for this item.
*/
public Uri getUri() {
return mUri;
}
/**
- * Get the extras for this track.
+ * Get the extras for this item.
*/
public Bundle getExtras() {
return mExtras;
}
/**
- * Builder for {@link MediaSession.Track} objects.
+ * Builder for {@link MediaSession.Item} objects.
*/
public static final class Builder {
private final MediaMetadata mMetadata;
@@ -1096,15 +1071,15 @@
public Builder(MediaMetadata metadata, long id, Uri uri) {
if (metadata == null) {
throw new IllegalArgumentException(
- "You must specify a non-null MediaMetadata to build a Track.");
+ "You must specify a non-null MediaMetadata to build an Item.");
}
if (uri == null) {
throw new IllegalArgumentException(
- "You must specify a non-null Uri to build a Track.");
+ "You must specify a non-null Uri to build an Item.");
}
if (id == UNKNOWN_ID) {
throw new IllegalArgumentException(
- "You must specify an id other than UNKNOWN_ID to build a Track.");
+ "You must specify an id other than UNKNOWN_ID to build an Item.");
}
mMetadata = metadata;
mId = id;
@@ -1112,18 +1087,18 @@
}
/**
- * Set optional extras for the track.
+ * Set optional extras for the item.
*/
- public MediaSession.Track.Builder setExtras(Bundle extras) {
+ public MediaSession.Item.Builder setExtras(Bundle extras) {
mExtras = extras;
return this;
}
/**
- * Create the {@link Track}.
+ * Create the {@link Item}.
*/
- public MediaSession.Track build() {
- return new MediaSession.Track(mMetadata, mId, mUri, mExtras);
+ public MediaSession.Item build() {
+ return new MediaSession.Item(mMetadata, mId, mUri, mExtras);
}
}
@@ -1140,23 +1115,23 @@
return 0;
}
- public static final Creator<MediaSession.Track> CREATOR
- = new Creator<MediaSession.Track>() {
+ public static final Creator<MediaSession.Item> CREATOR
+ = new Creator<MediaSession.Item>() {
@Override
- public MediaSession.Track createFromParcel(Parcel p) {
- return new MediaSession.Track(p);
+ public MediaSession.Item createFromParcel(Parcel p) {
+ return new MediaSession.Item(p);
}
@Override
- public MediaSession.Track[] newArray(int size) {
- return new MediaSession.Track[size];
+ public MediaSession.Item[] newArray(int size) {
+ return new MediaSession.Item[size];
}
};
@Override
public String toString() {
- return "MediaSession.Track {" +
+ return "MediaSession.Item {" +
"Metadata=" + mMetadata +
", Id=" + mId +
", Uri=" + mUri +
@@ -1182,7 +1157,7 @@
private static final int MSG_PLAY = 1;
private static final int MSG_PLAY_URI = 2;
private static final int MSG_PLAY_SEARCH = 3;
- private static final int MSG_SKIP_TO_TRACK = 4;
+ private static final int MSG_SKIP_TO_ITEM = 4;
private static final int MSG_PAUSE = 5;
private static final int MSG_STOP = 6;
private static final int MSG_NEXT = 7;
@@ -1232,8 +1207,8 @@
case MSG_PLAY_SEARCH:
mCallback.onPlayFromSearch((String) msg.obj, msg.getData());
break;
- case MSG_SKIP_TO_TRACK:
- mCallback.onSkipToTrack((Long) msg.obj);
+ case MSG_SKIP_TO_ITEM:
+ mCallback.onSkipToItem((Long) msg.obj);
case MSG_PAUSE:
mCallback.onPause();
break;
diff --git a/media/java/android/media/session/MediaSessionLegacyHelper.java b/media/java/android/media/session/MediaSessionLegacyHelper.java
index a182982..aa196a9 100644
--- a/media/java/android/media/session/MediaSessionLegacyHelper.java
+++ b/media/java/android/media/session/MediaSessionLegacyHelper.java
@@ -290,7 +290,6 @@
if (DEBUG) {
Log.d(TAG, "addMediaButtonListener already added " + pi);
}
- return;
}
holder.mMediaButtonListener = new MediaButtonListener(pi, context);
// TODO determine if handling transport performer commands should also
@@ -468,7 +467,11 @@
mSessions.remove(mPi);
} else if (mCb == null) {
mCb = new SessionCallback();
- mSession.setCallback(mCb);
+ Handler handler = null;
+ if (Looper.myLooper() == null) {
+ handler = new Handler(Looper.getMainLooper());
+ }
+ mSession.setCallback(mCb, handler);
}
}
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index 84983b9..185c6d8 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -23,12 +23,14 @@
import android.media.AudioManager;
import android.media.IRemoteVolumeController;
import android.media.session.ISessionManager;
+import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.service.notification.NotificationListenerService;
import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.Log;
import android.view.KeyEvent;
@@ -37,11 +39,11 @@
/**
* Provides support for interacting with {@link MediaSession media sessions}
- * that applications have published to express their ongoing media playback state.
+ * that applications have published to express their ongoing media playback
+ * state.
* <p>
* Use <code>Context.getSystemService(Context.MEDIA_SESSION_SERVICE)</code> to
* get an instance of this class.
- * <p>
*
* @see MediaSession
* @see MediaController
@@ -49,6 +51,9 @@
public final class MediaSessionManager {
private static final String TAG = "SessionManager";
+ private final ArrayMap<OnActiveSessionsChangedListener, SessionsChangedWrapper> mListeners
+ = new ArrayMap<OnActiveSessionsChangedListener, SessionsChangedWrapper>();
+ private final Object mLock = new Object();
private final ISessionManager mService;
private Context mContext;
@@ -133,15 +138,39 @@
* the calling app. You may also retrieve this list if your app is an
* enabled notification listener using the
* {@link NotificationListenerService} APIs, in which case you must pass the
- * {@link ComponentName} of your enabled listener.
+ * {@link ComponentName} of your enabled listener. Updates will be posted to
+ * the thread that registered the listener.
*
* @param sessionListener The listener to add.
* @param notificationListener The enabled notification listener component.
* May be null.
*/
- public void addActiveSessionsListener(SessionListener sessionListener,
- ComponentName notificationListener) {
- addActiveSessionsListener(sessionListener, notificationListener, UserHandle.myUserId());
+ public void addOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener sessionListener,
+ @Nullable ComponentName notificationListener) {
+ addOnActiveSessionsChangedListener(sessionListener, notificationListener, null);
+ }
+
+ /**
+ * Add a listener to be notified when the list of active sessions
+ * changes.This requires the
+ * android.Manifest.permission.MEDIA_CONTENT_CONTROL permission be held by
+ * the calling app. You may also retrieve this list if your app is an
+ * enabled notification listener using the
+ * {@link NotificationListenerService} APIs, in which case you must pass the
+ * {@link ComponentName} of your enabled listener. Updates will be posted to
+ * the handler specified or to the caller's thread if the handler is null.
+ *
+ * @param sessionListener The listener to add.
+ * @param notificationListener The enabled notification listener component.
+ * May be null.
+ * @param handler The handler to post events to.
+ */
+ public void addOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener sessionListener,
+ @Nullable ComponentName notificationListener, @Nullable Handler handler) {
+ addOnActiveSessionsChangedListener(sessionListener, notificationListener,
+ UserHandle.myUserId(), handler);
}
/**
@@ -157,17 +186,30 @@
* @param notificationListener The enabled notification listener component.
* May be null.
* @param userId The userId to listen for changes on.
+ * @param handler The handler to post updates on.
* @hide
*/
- public void addActiveSessionsListener(@NonNull SessionListener sessionListener,
- @Nullable ComponentName notificationListener, int userId) {
+ public void addOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener sessionListener,
+ @Nullable ComponentName notificationListener, int userId, @Nullable Handler handler) {
if (sessionListener == null) {
throw new IllegalArgumentException("listener may not be null");
}
- try {
- mService.addSessionsListener(sessionListener.mStub, notificationListener, userId);
- } catch (RemoteException e) {
- Log.e(TAG, "Error in addActiveSessionsListener.", e);
+ if (handler == null) {
+ handler = new Handler();
+ }
+ synchronized (mLock) {
+ if (mListeners.get(sessionListener) != null) {
+ Log.w(TAG, "Attempted to add session listener twice, ignoring.");
+ return;
+ }
+ SessionsChangedWrapper wrapper = new SessionsChangedWrapper(sessionListener, handler);
+ try {
+ mService.addSessionsListener(wrapper.mStub, notificationListener, userId);
+ mListeners.put(sessionListener, wrapper);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error in addOnActiveSessionsChangedListener.", e);
+ }
}
}
@@ -176,14 +218,20 @@
*
* @param listener The listener to remove.
*/
- public void removeActiveSessionsListener(@NonNull SessionListener listener) {
+ public void removeOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener listener) {
if (listener == null) {
throw new IllegalArgumentException("listener may not be null");
}
- try {
- mService.removeSessionsListener(listener.mStub);
- } catch (RemoteException e) {
- Log.e(TAG, "Error in removeActiveSessionsListener.", e);
+ synchronized (mLock) {
+ SessionsChangedWrapper wrapper = mListeners.remove(listener);
+ if (wrapper != null) {
+ try {
+ mService.removeSessionsListener(wrapper.mStub);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error in removeOnActiveSessionsChangedListener.", e);
+ }
+ }
}
}
@@ -249,35 +297,38 @@
/**
* Listens for changes to the list of active sessions. This can be added
- * using {@link #addActiveSessionsListener}.
+ * using {@link #addOnActiveSessionsChangedListener}.
*/
- public static abstract class SessionListener {
- private final Context mContext;
+ public interface OnActiveSessionsChangedListener {
+ public void onActiveSessionsChanged(@Nullable List<MediaController> controllers);
+ }
- public SessionListener(Context context) {
- mContext = context;
+ private final class SessionsChangedWrapper {
+ private final OnActiveSessionsChangedListener mListener;
+ private final Handler mHandler;
+
+ public SessionsChangedWrapper(OnActiveSessionsChangedListener listener, Handler handler) {
+ mListener = listener;
+ mHandler = handler;
}
- /**
- * Called when the list of active sessions has changed. This can be due
- * to a session being added or removed or the order of sessions
- * changing. The controllers will be provided in priority order with the
- * most important controller at index 0.
- *
- * @param controllers The updated list of controllers for the user that
- * changed.
- */
- public abstract void onActiveSessionsChanged(
- @Nullable List<MediaController> controllers);
private final IActiveSessionsListener.Stub mStub = new IActiveSessionsListener.Stub() {
@Override
- public void onActiveSessionsChanged(List<MediaSession.Token> tokens) {
- ArrayList<MediaController> controllers = new ArrayList<MediaController>();
- int size = tokens.size();
- for (int i = 0; i < size; i++) {
- controllers.add(new MediaController(mContext, tokens.get(i)));
+ public void onActiveSessionsChanged(final List<MediaSession.Token> tokens) {
+ if (mHandler != null) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ ArrayList<MediaController> controllers
+ = new ArrayList<MediaController>();
+ int size = tokens.size();
+ for (int i = 0; i < size; i++) {
+ controllers.add(new MediaController(mContext, tokens.get(i)));
+ }
+ mListener.onActiveSessionsChanged(controllers);
+ }
+ });
}
- SessionListener.this.onActiveSessionsChanged(controllers);
}
};
}
diff --git a/media/java/android/media/session/ParcelableVolumeInfo.java b/media/java/android/media/session/ParcelableVolumeInfo.java
index e71b539..f59c975 100644
--- a/media/java/android/media/session/ParcelableVolumeInfo.java
+++ b/media/java/android/media/session/ParcelableVolumeInfo.java
@@ -21,7 +21,7 @@
/**
* Convenience class for passing information about the audio configuration of a
- * session. The public implementation is {@link MediaController.VolumeInfo}.
+ * session. The public implementation is {@link MediaController.PlaybackInfo}.
*
* @hide
*/
diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java
index 2ad8eae..2ca97dd 100644
--- a/media/java/android/media/session/PlaybackState.java
+++ b/media/java/android/media/session/PlaybackState.java
@@ -120,11 +120,11 @@
public static final long ACTION_PLAY_FROM_SEARCH = 1 << 11;
/**
- * Indicates this performer supports the skip to track command.
+ * Indicates this performer supports the skip to item command.
*
* @see Builder#setActions(long)
*/
- public static final long ACTION_SKIP_TO_TRACK = 1 << 12;
+ public static final long ACTION_SKIP_TO_ITEM = 1 << 12;
/**
* This is the default playback state and indicates that no media has been
@@ -217,26 +217,26 @@
private final int mState;
private final long mPosition;
- private final long mBufferPosition;
+ private final long mBufferedPosition;
private final float mSpeed;
private final long mActions;
private List<PlaybackState.CustomAction> mCustomActions;
private final CharSequence mErrorMessage;
private final long mUpdateTime;
- private final long mActiveTrackId;
+ private final long mActiveItemId;
private PlaybackState(int state, long position, long updateTime, float speed,
- long bufferPosition, long transportControls,
- List<PlaybackState.CustomAction> customActions, long activeTrackId,
+ long bufferedPosition, long transportControls,
+ List<PlaybackState.CustomAction> customActions, long activeItemId,
CharSequence error) {
mState = state;
mPosition = position;
mSpeed = speed;
mUpdateTime = updateTime;
- mBufferPosition = bufferPosition;
+ mBufferedPosition = bufferedPosition;
mActions = transportControls;
mCustomActions = new ArrayList<>(customActions);
- mActiveTrackId = activeTrackId;
+ mActiveItemId = activeItemId;
mErrorMessage = error;
}
@@ -245,10 +245,10 @@
mPosition = in.readLong();
mSpeed = in.readFloat();
mUpdateTime = in.readLong();
- mBufferPosition = in.readLong();
+ mBufferedPosition = in.readLong();
mActions = in.readLong();
mCustomActions = in.createTypedArrayList(CustomAction.CREATOR);
- mActiveTrackId = in.readLong();
+ mActiveItemId = in.readLong();
mErrorMessage = in.readCharSequence();
}
@@ -258,12 +258,12 @@
StringBuilder bob = new StringBuilder("PlaybackState {");
bob.append("state=").append(mState);
bob.append(", position=").append(mPosition);
- bob.append(", buffered position=").append(mBufferPosition);
+ bob.append(", buffered position=").append(mBufferedPosition);
bob.append(", speed=").append(mSpeed);
bob.append(", updated=").append(mUpdateTime);
bob.append(", actions=").append(mActions);
bob.append(", custom actions=").append(mCustomActions);
- bob.append(", active track id=").append(mActiveTrackId);
+ bob.append(", active item id=").append(mActiveItemId);
bob.append(", error=").append(mErrorMessage);
bob.append("}");
return bob.toString();
@@ -280,10 +280,10 @@
dest.writeLong(mPosition);
dest.writeFloat(mSpeed);
dest.writeLong(mUpdateTime);
- dest.writeLong(mBufferPosition);
+ dest.writeLong(mBufferedPosition);
dest.writeLong(mActions);
dest.writeTypedList(mCustomActions);
- dest.writeLong(mActiveTrackId);
+ dest.writeLong(mActiveItemId);
dest.writeCharSequence(mErrorMessage);
}
@@ -310,12 +310,12 @@
}
/**
- * Get the current buffer position in ms. This is the farthest playback
+ * Get the current buffered position in ms. This is the farthest playback
* point that can be reached from the current position using only buffered
* content.
*/
- public long getBufferPosition() {
- return mBufferPosition;
+ public long getBufferedPosition() {
+ return mBufferedPosition;
}
/**
@@ -711,12 +711,12 @@
private int mState;
private long mPosition;
- private long mBufferPosition;
+ private long mBufferedPosition;
private float mSpeed;
private long mActions;
private CharSequence mErrorMessage;
private long mUpdateTime;
- private long mActiveTrackId = MediaSession.Track.UNKNOWN_ID;
+ private long mActiveItemId = MediaSession.Item.UNKNOWN_ID;
/**
* Creates an initially empty state builder.
@@ -736,7 +736,7 @@
}
mState = from.mState;
mPosition = from.mPosition;
- mBufferPosition = from.mBufferPosition;
+ mBufferedPosition = from.mBufferedPosition;
mSpeed = from.mSpeed;
mActions = from.mActions;
if (from.mCustomActions != null) {
@@ -744,14 +744,14 @@
}
mErrorMessage = from.mErrorMessage;
mUpdateTime = from.mUpdateTime;
- mActiveTrackId = from.mActiveTrackId;
+ mActiveItemId = from.mActiveItemId;
}
/**
* Set the current state of playback.
* <p>
* The position must be in ms and indicates the current playback
- * position within the track. If the position is unknown use
+ * position within the item. If the position is unknown use
* {@link #PLAYBACK_POSITION_UNKNOWN}. When not using an unknown
* position the time at which the position was updated must be provided.
* It is okay to use {@link SystemClock#elapsedRealtime()} if the
@@ -773,7 +773,7 @@
* </ul>
*
* @param state The current state of playback.
- * @param position The position in the current track in ms.
+ * @param position The position in the current item in ms.
* @param playbackSpeed The current speed of playback as a multiple of
* normal playback.
* @param updateTime The time in the {@link SystemClock#elapsedRealtime}
@@ -792,7 +792,7 @@
* Set the current state of playback.
* <p>
* The position must be in ms and indicates the current playback
- * position within the track. If the position is unknown use
+ * position within the item. If the position is unknown use
* {@link #PLAYBACK_POSITION_UNKNOWN}. The update time will be set to
* the current {@link SystemClock#elapsedRealtime()}.
* <p>
@@ -812,7 +812,7 @@
* </ul>
*
* @param state The current state of playback.
- * @param position The position in the current track in ms.
+ * @param position The position in the current item in ms.
* @param playbackSpeed The current speed of playback as a multiple of
* normal playback.
* @return this
@@ -889,27 +889,28 @@
}
/**
- * Set the current buffer position in ms. This is the farthest playback
- * point that can be reached from the current position using only
- * buffered content.
+ * Set the current buffered position in ms. This is the farthest
+ * playback point that can be reached from the current position using
+ * only buffered content.
*
- * @param bufferPosition The position in ms that playback is buffered to.
+ * @param bufferedPosition The position in ms that playback is buffered
+ * to.
* @return this
*/
- public Builder setBufferPosition(long bufferPosition) {
- mBufferPosition = bufferPosition;
+ public Builder setBufferedPosition(long bufferedPosition) {
+ mBufferedPosition = bufferedPosition;
return this;
}
/**
- * Set the active track in the play queue by specifying its id.
- * The default value is {@link MediaSession.Track#UNKNOWN_ID}
+ * Set the active item in the play queue by specifying its id. The
+ * default value is {@link MediaSession.Item#UNKNOWN_ID}
*
- * @param id The id of the active track.
+ * @param id The id of the active item.
* @return this
*/
- public Builder setActiveTrack(long id) {
- mActiveTrackId = id;
+ public Builder setActiveItem(long id) {
+ mActiveItemId = id;
return this;
}
@@ -931,8 +932,8 @@
* @return A new state instance.
*/
public PlaybackState build() {
- return new PlaybackState(mState, mPosition, mUpdateTime, mSpeed, mBufferPosition,
- mActions, mCustomActions, mActiveTrackId, mErrorMessage);
+ return new PlaybackState(mState, mPosition, mUpdateTime, mSpeed, mBufferedPosition,
+ mActions, mCustomActions, mActiveItemId, mErrorMessage);
}
}
}
diff --git a/media/java/android/media/tv/ITvInputServiceCallback.aidl b/media/java/android/media/tv/ITvInputServiceCallback.aidl
index de5d56f..74ab562 100644
--- a/media/java/android/media/tv/ITvInputServiceCallback.aidl
+++ b/media/java/android/media/tv/ITvInputServiceCallback.aidl
@@ -25,6 +25,6 @@
*/
oneway interface ITvInputServiceCallback {
void addHardwareTvInput(in int deviceId, in TvInputInfo inputInfo);
- void addHdmiTvInput(in int logicalAddress, in TvInputInfo inputInfo);
+ void addHdmiTvInput(in int id, in TvInputInfo inputInfo);
void removeTvInput(in String inputId);
}
diff --git a/media/java/android/media/tv/ITvInputSession.aidl b/media/java/android/media/tv/ITvInputSession.aidl
index 99fb911..1aad2fa 100644
--- a/media/java/android/media/tv/ITvInputSession.aidl
+++ b/media/java/android/media/tv/ITvInputSession.aidl
@@ -29,7 +29,7 @@
oneway interface ITvInputSession {
void release();
- void setMainSession(boolean isMainSession);
+ void setMain(boolean isMain);
void setSurface(in Surface surface);
void dispatchSurfaceChanged(int format, int width, int height);
// TODO: Remove this once it becomes irrelevant for applications to handle audio focus. The plan
diff --git a/media/java/android/media/tv/ITvInputSessionWrapper.java b/media/java/android/media/tv/ITvInputSessionWrapper.java
index 5022cc1..58e46f0 100644
--- a/media/java/android/media/tv/ITvInputSessionWrapper.java
+++ b/media/java/android/media/tv/ITvInputSessionWrapper.java
@@ -42,7 +42,7 @@
private static final String TAG = "TvInputSessionWrapper";
private static final int DO_RELEASE = 1;
- private static final int DO_SET_MAIN_SESSION = 2;
+ private static final int DO_SET_MAIN = 2;
private static final int DO_SET_SURFACE = 3;
private static final int DO_DISPATCH_SURFACE_CHANGED = 4;
private static final int DO_SET_STREAM_VOLUME = 5;
@@ -91,8 +91,8 @@
}
return;
}
- case DO_SET_MAIN_SESSION: {
- mTvInputSessionImpl.setMainSession((Boolean) msg.obj);
+ case DO_SET_MAIN: {
+ mTvInputSessionImpl.setMain((Boolean) msg.obj);
return;
}
case DO_SET_SURFACE: {
@@ -162,8 +162,8 @@
}
@Override
- public void setMainSession(boolean isMain) {
- mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_MAIN_SESSION, isMain));
+ public void setMain(boolean isMain) {
+ mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_MAIN, isMain));
}
@Override
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java
index 25252ed..405ef22 100644
--- a/media/java/android/media/tv/TvContentRating.java
+++ b/media/java/android/media/tv/TvContentRating.java
@@ -34,42 +34,87 @@
* strings, or a TV input service defined strings.
* TV input service defined strings are in an xml file defined in <code><{@link
* android.R.styleable#TvInputService tv-input}></code> with the {@link
- * android.R.attr#contentRatingSystemXml contentRatingSystemXml} attribute by the TV input service.
+ * android.R.attr#tvContentRatingDescription tvContentRatingDescription} attribute by the TV input
+ * service.
*
- * <h3> Content Rating System XML format </h3>
- * The XML file for publishing content rating system should follow the DTD bellow:
+ * <h3> Example: Rating system definition for the TV Parental Guidelines</h3>
+ * The following XML example shows how the TV Parental Guidelines in United States can be defined:
* <p><pre class="prettyprint">
- * <?xml version="1.0" encoding="UTF-8"?>
- * <!DOCTYPE rating-systems [
- * <!ELEMENT rating-system-definitions (rating-system-definition+)>
- * <!ATTLIST rating-system-definitions
- * version CDATA #REQUIRED>
- * <!ELEMENT rating-system-definition (
- * (sub-rating-definition*, rating-definition, sub-rating-definition*)+, order*)>
- * <!ATTLIST rating-system-definition
- * id ID #REQUIRED
- * displayName CDATA #IMPLIED
- * description CDATA #IMPLIED
- * country CDATA #IMPLIED>
- * <!ELEMENT sub-rating-definition EMPTY>
- * <!ATTLIST sub-rating-definition
- * id ID #REQUIRED
- * displayName CDATA #IMPLIED
- * icon CDATA #IMPLIED
- * description CDATA #IMPLIED>
- * <!ELEMENT rating-definition (sub-rating*))>
- * <!ATTLIST rating-definition
- * id ID #REQUIRED
- * displayName CDATA #IMPLIED
- * icon CDATA #IMPLIED
- * description CDATA #IMPLIED>
- * <!ELEMENT sub-rating EMPTY>
- * <!ATTLIST sub-rating id IDREF #REQUIRED>
- * <!ELEMENT order (rating, rating+)>
- * <!ELEMENT rating EMPTY>
- * <!ATTLIST rating id IDREF #REQUIRED>
- * ]>
- * </pre></p>
+ * {@literal
+ * <?xml version="1.0" encoding="UTF-8"?>
+ * <rating-system-definitions version="1.0">
+ * <rating-system-definition id="US_TV"
+ * displayName="US-TV"
+ * description="The TV Parental Guidelines"
+ * country="US">
+ * <sub-rating-definition id="US_TV_D"
+ * displayName="D"
+ * description="Suggestive dialogue (Usually means talks about sex)" />
+ * <sub-rating-definition id="US_TV_L"
+ * displayName="L"
+ * description="Coarse language" />
+ * <sub-rating-definition id="US_TV_S"
+ * displayName="S"
+ * description="Sexual content" />
+ * <sub-rating-definition id="US_TV_V"
+ * displayName="V"
+ * description="Violence" />
+ * <sub-rating-definition id="US_TV_FV"
+ * displayName="FV"
+ * description="Fantasy violence (Children\'s programming only)" />
+ *
+ * <rating-definition id="US_TV_Y"
+ * displayName="TV-Y"
+ * description="This program is designed to be appropriate for all children"
+ * ageHint="0" />
+ * <rating-definition id="US_TV_Y7"
+ * displayName="TV-Y7"
+ * description="This program is designed for children age 7 and above"
+ * ageHint="7">
+ * <sub-rating id="US_TV_FV" />
+ * </rating-definition>
+ * <rating-definition id="US_TV_G"
+ * displayName="TV-G"
+ * description="Most parents would find this program suitable for all ages"
+ * ageHint="0" />
+ * <rating-definition id="US_TV_PG"
+ * displayName="TV-PG"
+ * description="This program contains material that parents may find unsuitable for younger children"
+ * ageHint="14">
+ * <sub-rating id="US_TV_D" />
+ * <sub-rating id="US_TV_L" />
+ * <sub-rating id="US_TV_S" />
+ * <sub-rating id="US_TV_V" />
+ * </rating-definition>
+ * <rating-definition id="US_TV_14"
+ * displayName="TV-14"
+ * description="This program contains some material that many parents would find unsuitable for children under 14 years of age"
+ * ageHint="14">
+ * <sub-rating id="US_TV_D" />
+ * <sub-rating id="US_TV_L" />
+ * <sub-rating id="US_TV_S" />
+ * <sub-rating id="US_TV_V" />
+ * </rating-definition>
+ * <rating-definition id="US_TV_MA"
+ * displayName="TV-MA"
+ * description="This program is specifically designed to be viewed by adults and therefore may be unsuitable for children under 17"
+ * ageHint="17">
+ * <sub-rating id="US_TV_L" />
+ * <sub-rating id="US_TV_S" />
+ * <sub-rating id="US_TV_V" />
+ * </rating-definition>
+ * <order>
+ * <rating id="US_TV_Y" />
+ * <rating id="US_TV_Y7" />
+ * </order>
+ * <order>
+ * <rating id="US_TV_G" />
+ * <rating id="US_TV_PG" />
+ * <rating id="US_TV_14" />
+ * <rating id="US_TV_MA" />
+ * </order>
+ * </rating-system-definition>
+ * </rating-system-definitions>}</pre></p>
*
* <h3>System defined rating strings</h3>
*
@@ -86,9 +131,9 @@
* </table>
*
* <u>System defined string for {@code ratingSystem}</u>
- * <table border="0" cellspacing="0" cellpadding="0">
+ * <table border="1" cellspacing="0" cellpadding="0">
* <tr>
- * <td width=10%>String value</td>
+ * <td width="10%">String value</td>
* <td>Comments</td>
* </tr>
* <tr>
@@ -101,111 +146,111 @@
* </tr>
* <tr>
* <td>AR_TV</td>
- * <td>TV content rating system for Argentina TV</td>
+ * <td>TV content rating system for Argentina</td>
* </tr>
* <tr>
* <td>AU_TV</td>
- * <td>TV content rating system for Australia TV</td>
+ * <td>TV content rating system for Australia</td>
* </tr>
* <tr>
* <td>BG_TV</td>
- * <td>TV content rating system for Bulgaria TV</td>
+ * <td>TV content rating system for Bulgaria</td>
* </tr>
* <tr>
* <td>BR_TV</td>
- * <td>TV content rating system for Brazil TV</td>
+ * <td>TV content rating system for Brazil</td>
* </tr>
* <tr>
* <td>CA_TV</td>
- * <td>TV content rating system for Canada TV</td>
+ * <td>TV content rating system for Canada</td>
* </tr>
* <tr>
* <td>CH_TV</td>
- * <td>TV content rating system for Switzerland TV</td>
+ * <td>TV content rating system for Switzerland</td>
* </tr>
* <tr>
* <td>CL_TV</td>
- * <td>TV content rating system for Chile TV</td>
+ * <td>TV content rating system for Chile</td>
* </tr>
* <tr>
* <td>DE_TV</td>
- * <td>TV content rating system for Germany TV</td>
+ * <td>TV content rating system for Germany</td>
* </tr>
* <tr>
* <td>DK_TV</td>
- * <td>TV content rating system for Denmark TV</td>
+ * <td>TV content rating system for Denmark</td>
* </tr>
* <tr>
* <td>ES_TV</td>
- * <td>TV content rating system for Spain TV</td>
+ * <td>TV content rating system for Spain</td>
* </tr>
* <tr>
* <td>FI_TV</td>
- * <td>TV content rating system for Finland TV</td>
+ * <td>TV content rating system for Finland</td>
* </tr>
* <tr>
* <td>FR_TV</td>
- * <td>TV content rating system for France TV</td>
+ * <td>TV content rating system for France</td>
* </tr>
* <tr>
* <td>GR_TV</td>
- * <td>TV content rating system for Greece TV</td>
+ * <td>TV content rating system for Greece</td>
* </tr>
* <tr>
* <td>HK_TV</td>
- * <td>TV content rating system for Hong Kong TV</td>
+ * <td>TV content rating system for Hong Kong</td>
* </tr>
* <tr>
* <td>HU_TV</td>
- * <td>TV content rating system for Hungary TV</td>
+ * <td>TV content rating system for Hungary</td>
* </tr>
* <tr>
* <td>ID_TV</td>
- * <td>TV content rating system for Indonesia TV</td>
+ * <td>TV content rating system for Indonesia</td>
* </tr>
* <tr>
* <td>IE_TV</td>
- * <td>TV content rating system for Ireland TV</td>
+ * <td>TV content rating system for Ireland</td>
* </tr>
* <tr>
* <td>IL_TV</td>
- * <td>TV content rating system for Israel TV</td>
+ * <td>TV content rating system for Israel</td>
* </tr>
* <tr>
* <td>IN_TV</td>
- * <td>TV content rating system for India TV</td>
+ * <td>TV content rating system for India</td>
* </tr>
* <tr>
* <td>IS_TV</td>
- * <td>TV content rating system for Iceland TV</td>
+ * <td>TV content rating system for Iceland</td>
* </tr>
* <tr>
* <td>KR_TV</td>
- * <td>TV content rating system for South Korea TV</td>
+ * <td>TV content rating system for South Korea</td>
* </tr>
* <tr>
* <td>MV_TV</td>
- * <td>TV content rating system for Maldives TV</td>
+ * <td>TV content rating system for Maldives</td>
* </tr>
* <tr>
* <td>MX_TV</td>
- * <td>TV content rating system for Mexico TV</td>
+ * <td>TV content rating system for Mexico</td>
* </tr>
* <tr>
* <td>MY_TV</td>
- * <td>TV content rating system for Malaysia TV</td>
+ * <td>TV content rating system for Malaysia</td>
* </tr>
* <tr>
* <td>NL_TV</td>
- * <td>TV content rating system for Netherlands TV</td>
+ * <td>TV content rating system for Netherlands</td>
* </tr>
* <tr>
* <td>NZ_FTV</td>
- * <td>New Zealand\'s free-to-air TV content rating system</td>
+ * <td>TV content rating system for free-to-air channels in New Zealand</td>
* </tr>
* <tr>
* <td>NZ_PTV</td>
- * <td>New Zealand\'s pay TV content rating system</td>
+ * <td>TV content rating system for Pay TV channels in New Zealand</td>
* </tr>
* <tr>
* <td>PE_TV</td>
@@ -214,87 +259,89 @@
* <tr>
* <td>PE_ATV</td>
* <td>TV content rating system for America Television in Peru that uses its own rating
- * </td>
+ * system</td>
* </tr>
* <tr>
* <td>PH_TV</td>
- * <td>TV content rating system for Philippines TV</td>
+ * <td>TV content rating system for Philippines</td>
* </tr>
* <tr>
* <td>PL_TV</td>
- * <td>TV content rating system for Poland TV</td>
+ * <td>TV content rating system for Poland</td>
* </tr>
* <tr>
* <td>PT_TV</td>
- * <td>TV content rating system for Portugal TV</td>
+ * <td>TV content rating system for Portugal</td>
* </tr>
* <tr>
* <td>RO_TV</td>
- * <td>TV content rating system for Romania TV</td>
+ * <td>TV content rating system for Romania</td>
* </tr>
* <tr>
* <td>RU_TV</td>
- * <td>TV content rating system for Russia TV</td>
+ * <td>TV content rating system for Russia</td>
* </tr>
* <tr>
* <td>RS_TV</td>
- * <td>TV content rating system for Serbia TV</td>
+ * <td>TV content rating system for Serbia</td>
* </tr>
* <tr>
* <td>SG_FTV</td>
- * <td>TV content rating system for Singapore TV</td>
+ * <td>TV content rating system for Singapore</td>
* </tr>
* <tr>
* <td>SG_PTV</td>
- * <td>TV content rating system for Singapore TV</td>
+ * <td>TV content rating system for Singapore</td>
* </tr>
* <tr>
* <td>SI_TV</td>
- * <td>TV content rating system for Slovenia TV</td>
+ * <td>TV content rating system for Slovenia</td>
* </tr>
* <tr>
* <td>TH_TV</td>
- * <td>TV content rating system for Thailand TV</td>
+ * <td>TV content rating system for Thailand</td>
* </tr>
* <tr>
* <td>TR_TV</td>
- * <td>TV content rating system for Turkey TV</td>
+ * <td>TV content rating system for Turkey</td>
* </tr>
* <tr>
* <td>TW_TV</td>
- * <td>TV content rating system for Taiwan TV</td>
+ * <td>TV content rating system for Taiwan</td>
* </tr>
* <tr>
* <td>UA_TV</td>
- * <td>TV content rating system for Ukraine TV</td>
+ * <td>TV content rating system for Ukraine</td>
* </tr>
* <tr>
- * <td>US_TVPG</td>
- * <td>The TV Parental Guidelines</td>
+ * <td>US_TV</td>
+ * <td>TV content rating system for United States</td>
* </tr>
* <tr>
* <td>VE_TV</td>
- * <td>TV content rating system for Venezuela TV</td>
+ * <td>TV content rating system for Venezuela</td>
* </tr>
* <tr>
* <td>ZA_TV</td>
- * <td>TV content rating system for South Africa TV</td>
+ * <td>TV content rating system for South Africa</td>
* </tr>
* </table>
*
* <u>System defined string for {@code rating}</u>
- * <table border="0" cellspacing="0" cellpadding="0">
+ * <table border="1" cellspacing="0" cellpadding="0">
* <tr>
- * <td width=10%>String value</td>
+ * <td width="10%">RatingSystem code</td>
+ * <td width="10%">Rating string value</td>
* <td>Comments</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">AM_TV_RS</td>
* <td>AM_TV_RS_Y</td>
- * <td>Suitable for ages 2–11</td>
+ * <td>Suitable for ages 2-11</td>
* </tr>
* <tr>
* <td>AM_TV_RS_Y7</td>
- * <td>Suitable for ages 7–16</td>
+ * <td>Suitable for ages 7-16</td>
* </tr>
* <tr>
* <td>AM_TV_RS_GA</td>
@@ -313,6 +360,7 @@
* <td>Suitable only for adults ages 18 and up</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">AM_TV_AS</td>
* <td>AM_TV_AS_EC</td>
* <td>Suitable for ages 2 and up</td>
* </tr>
@@ -337,26 +385,28 @@
* <td>Suitable for ages 17 and up</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">AR_TV</td>
* <td>AR_TV_ALL</td>
* <td>Suitable for all audiences. Programs may contain mild violence, language and mature
- * </td>
+ * situations</td>
* </tr>
* <tr>
* <td>AR_TV_13</td>
* <td>Suitable for ages 13 and up. Programs may contain mild to moderate language and mild
- * and sexual references</td>
+ * violence and sexual references</td>
* </tr>
* <tr>
* <td>AR_TV_16</td>
* <td>Suitable for ages 16 and up. Programs may contain more intensive violence and coarse
- * partial nudity and moderate sexual references</td>
+ * language, partial nudity and moderate sexual references</td>
* </tr>
* <tr>
* <td>AR_TV_18</td>
* <td>Suitable for mature audiences only. Programs contain strong violence, coarse language
- * explicit sexual references</td>
+ * and explicit sexual references</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">AU_TV</td>
* <td>AU_TV_CTC</td>
* <td>This has advertising approval, but is not yet classified</td>
* </tr>
@@ -367,17 +417,17 @@
* <tr>
* <td>AU_TV_PG</td>
* <td>The content is mild in impact, but it may contain content that children find
- * or upsetting and may require the guidance or parents and guardians</td>
+ * confusing or upsetting and may require the guidance or parents and guardians</td>
* </tr>
* <tr>
* <td>AU_TV_M</td>
* <td>The content is moderate in impact, and it is recommended for teenagers aged 15 years
- * over</td>
+ * and over</td>
* </tr>
* <tr>
* <td>AU_TV_MA15</td>
* <td>The content is strong in impact, and it is legally restricted to persons 15 years and
- * </td>
+ * over</td>
* </tr>
* <tr>
* <td>AU_TV_R18</td>
@@ -386,37 +436,39 @@
* <tr>
* <td>AU_TV_X18</td>
* <td>The content is restricted to adults. This classification is a special and legally
- * category which contains only sexually explicit content</td>
+ * restricted category which contains only sexually explicit content</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">BG_TV</td>
* <td>BG_TV_A</td>
* <td>Recommended to children. When the film confirms the ideals of humanism or popularizes
- * national and world cultures or contributes to upbringing children</td>
+ * the national and world cultures or contributes to upbringing children</td>
* </tr>
* <tr>
* <td>BG_TV_B</td>
* <td>No restrictive recommendations from the Committee. When the film is in no way
- * to the universal rules of morality in this country, has no restrictive recommendations
- * the Committee and does not fall in rating A</td>
+ * contrary to the universal rules of morality in this country, has no restrictive
+ * recommendations from the Committee and does not fall in rating A</td>
* </tr>
* <tr>
* <td>BG_TV_C</td>
* <td>No persons under the age of 12 are admitted unless accompanied by an adult. When the
- * contains certain erotic scenes or scenes with drinking, taking drugs or stimulants or a
- * scenes of violence</td>
+ * film contains certain erotic scenes or scenes with drinking, taking drugs or stimulants
+ * or a few scenes of violence</td>
* </tr>
* <tr>
* <td>BG_TV_D</td>
* <td>No persons under the age of 16 are admitted. When the film contains quite a number of
- * scenes or scenes with drinking, taking drugs or stimulants or a considerable number of
- * showing violence</td>
+ * erotic scenes or scenes with drinking, taking drugs or stimulants or a considerable
+ * number of scenes showing violence</td>
* </tr>
* <tr>
* <td>BG_TV_X</td>
* <td>No persons under the age of 18 are admitted. When the film is naturalistically erotic
- * shows violence in an ostentatious manner</td>
+ * or shows violence in an ostentatious manner</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">BR_TV</td>
* <td>BR_TV_L</td>
* <td>Content is suitable for all audiences</td>
* </tr>
@@ -441,52 +493,55 @@
* <td>Content suitable for viewers over the age of 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">CA_TV</td>
* <td>CA_TV_EXEMPT</td>
* <td>Shows which are exempt from ratings (such as news and sports programming) will not
- * an on-screen rating at all</td>
+ * display an on-screen rating at all</td>
* </tr>
* <tr>
* <td>CA_TV_C</td>
- * <td>Programming suitable for children ages of 2–7 years. No profanity or sexual content
- * any level allowed. Contains little violence</td>
+ * <td>Programming suitable for children ages of 2-7 years. No profanity or sexual content
+ * of any level allowed. Contains little violence</td>
* </tr>
* <tr>
* <td>CA_TV_C8</td>
* <td>Suitable for children ages 8+. Low level violence and fantasy horror is allowed. No
- * language is allowed, but occasional "socially offensive and discriminatory" language is
- * if in the context of the story. No sexual content of any level allowed</td>
+ * foul language is allowed, but occasional "socially offensive and discriminatory" language
+ * is allowed if in the context of the story. No sexual content of any level allowed</td>
* </tr>
* <tr>
* <td>CA_TV_G</td>
* <td>Suitable for general audiences. Programming suitable for the entire family with mild
- * and mild profanity and/or censored language</td>
+ * violence, and mild profanity and/or censored language</td>
* </tr>
* <tr>
* <td>CA_TV_PG</td>
* <td>Parental guidance. Moderate violence and moderate profanity is allowed, as is brief
- * and sexual references if important to the context of the story</td>
+ * nudity and sexual references if important to the context of the story</td>
* </tr>
* <tr>
* <td>CA_TV_14</td>
* <td>Programming intended for viewers ages 14 and older. May contain strong violence and
- * profanity, and depictions of sexual activity as long as they are within the context of a
- * </td>
+ * strong profanity, and depictions of sexual activity as long as they are within the
+ * context of a story</td>
* </tr>
* <tr>
* <td>CA_TV_18</td>
* <td>Programming intended for viewers ages 18 and older. May contain explicit violence and
- * activity</td>
+ * sexual activity</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="2">CH_TV</td>
* <td>CH_TV_ALL</td>
* <td>This program is suitable for all ages</td>
* </tr>
* <tr>
* <td>CH_TV_RED</td>
* <td>This program contains scenes that may hurt sensitive people, therefore the red symbol
- * be displayed</td>
+ * will be displayed</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">CL_TV</td>
* <td>CL_TV_I</td>
* <td>Programs suitable for all children</td>
* </tr>
@@ -513,9 +568,10 @@
* <tr>
* <td>CL_TV_A</td>
* <td>Programs suitable for adult audiences only (ages 18 or older), may contain coarse
- * and sexual or explicit situations</td>
+ * language, and sexual or explicit situations</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">DE_TV</td>
* <td>DE_TV_ALL</td>
* <td>The program is suitable for all ages</td>
* </tr>
@@ -532,6 +588,7 @@
* <td>The program is not suitable for viewers under the age of 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">DK_TV</td>
* <td>DK_TV_G</td>
* <td>programs suitable for all ages</td>
* </tr>
@@ -548,6 +605,7 @@
* <td>programs containing explicit content and strictly for adults only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">ES_TV</td>
* <td>ES_TV_TP</td>
* <td>Recommended for all ages</td>
* </tr>
@@ -576,6 +634,7 @@
* <td>Recommended for people older than 18 years old</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">FI_TV</td>
* <td>FI_TV_S</td>
* <td>Allowed at all times</td>
* </tr>
@@ -596,6 +655,7 @@
* <td>Not recommended for children under 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">FR_TV</td>
* <td>FR_TV_ALL</td>
* <td>Appropriate for all ages</td>
* </tr>
@@ -616,6 +676,7 @@
* <td>Not recommended for persons under 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">GR_TV</td>
* <td>GR_TV_all</td>
* <td>Suitable for all ages</td>
* </tr>
@@ -634,9 +695,10 @@
* <tr>
* <td>GR_TV_18</td>
* <td>Suitable only for adults profanity before midnight is punishable by fine, except when
- * in the context of the program</td>
+ * used in the context of the program</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">HK_TV</td>
* <td>HK_TV_G</td>
* <td>For general audiences</td>
* </tr>
@@ -649,35 +711,37 @@
* <td>Programs are recommended only for adult viewers above the age of 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">HU_TV</td>
* <td>HU_TV_U</td>
* <td>Programs can be viewed by any age</td>
* </tr>
* <tr>
* <td>HU_TV_CF</td>
* <td>Programs recommended for children. It is an optional rating, there is no obligation
- * broadcasters to indicate it</td>
+ * for broadcasters to indicate it</td>
* </tr>
* <tr>
* <td>HU_TV_6</td>
* <td>Programs not recommended for children below the age of 6, may not contain any
- * or sexual content</td>
+ * violence or sexual content</td>
* </tr>
* <tr>
* <td>HU_TV_12</td>
* <td>Programs not recommended for children below the age of 12, may contain light sexual
- * or explicit language</td>
+ * content or explicit language</td>
* </tr>
* <tr>
* <td>HU_TV_16</td>
* <td>Programs not recommended for teens and children below the age of 16, may contain more
- * violence and sexual content</td>
+ * intensive violence and sexual content</td>
* </tr>
* <tr>
* <td>HU_TV_18</td>
* <td>The program is recommended only for adult viewers (for ages 18 and up), may contain
- * violence and explicit sexual content</td>
+ * explicit violence and explicit sexual content</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="8">ID_TV</td>
* <td>ID_TV_P</td>
* <td>Suitable for children from ages 2 through 11</td>
* </tr>
@@ -710,18 +774,19 @@
* <td>Suitable for viewers over 18 and older only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">IE_TV</td>
* <td>IE_TV_GA</td>
* <td>Suitable for all ages</td>
* </tr>
* <tr>
* <td>IE_TV_Ch</td>
* <td>Suitable for children ages 5 to 10, may contain comedic violence or action fantasy
- * </td>
+ * violence</td>
* </tr>
* <tr>
* <td>IE_TV_YA</td>
* <td>Suitable for adolescent audiences, may contain thematic elements that would appeal to
- * </td>
+ * teenagers</td>
* </tr>
* <tr>
* <td>IE_TV_PS</td>
@@ -730,17 +795,18 @@
* <tr>
* <td>IE_TV_MA</td>
* <td>Most restrictive classification, allowing for heavy subject matter and coarse
- * </td>
+ * language</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">IL_TV</td>
* <td>IL_TV_G</td>
* <td>General audience; anyone, regardless of age, can view the program, usually news and
- * programming</td>
+ * children's programming</td>
* </tr>
* <tr>
* <td>IL_TV_12</td>
* <td>Suitable for teens and children ages 12 and over, no child under 12 are permitted to
- * the program</td>
+ * view the program</td>
* </tr>
* <tr>
* <td>IL_TV_15</td>
@@ -755,13 +821,14 @@
* <td>Exempt from classification</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">IN_TV</td>
* <td>IN_TV_U</td>
* <td>Unrestricted public exhibition</td>
* </tr>
* <tr>
* <td>IN_TV_U/A</td>
* <td>Unrestricted public exhibition, but with a caution regarding parental guidance to
- * under 12 years of age</td>
+ * those under 12 years of age</td>
* </tr>
* <tr>
* <td>IN_TV_A</td>
@@ -773,6 +840,7 @@
* </td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">IS_TV</td>
* <td>IS_TV_L</td>
* <td>Programs suitable for all ages</td>
* </tr>
@@ -801,29 +869,31 @@
* <td>Programs suitable for ages 18 and older</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">KR_TV</td>
* <td>KR_TV_All</td>
* <td>Appropriate for all ages</td>
* </tr>
* <tr>
* <td>KR_TV_7</td>
* <td>May contain material inappropriate for children younger than 7, and parental
- * should be used</td>
+ * discretion should be used</td>
* </tr>
* <tr>
* <td>KR_TV_12</td>
* <td>May deemed inappropriate for those younger than 12, and parental discretion should be
- * </td>
+ * used</td>
* </tr>
* <tr>
* <td>KR_TV_15</td>
* <td>May be inappropriate for children under 15, and that parental discretion should be
- * </td>
+ * used</td>
* </tr>
* <tr>
* <td>KR_TV_19</td>
* <td>For adults only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="9">MV_TV</td>
* <td>MV_TV_Y</td>
* <td>Young children</td>
* </tr>
@@ -860,6 +930,7 @@
* <td>Most restrictive classification, only adults ages 25 and above may view</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">MX_TV</td>
* <td>MX_TV_A</td>
* <td>Appropriate for all ages, parental guidance is recommended for children under 7 years
* </td>
@@ -867,41 +938,43 @@
* <tr>
* <td>MX_TV_B</td>
* <td>Designed for ages 12 and older, may contain some sexual situations, mild violence,
- * mild language</td>
+ * and mild language</td>
* </tr>
* <tr>
* <td>MX_TV_B-15</td>
- * <td>Designed for ages 15 and up, slightly more intensive than the \'A\' and \'B\' ratings
+ * <td>Designed for ages 15 and up, slightly more intensive than the 'A' and 'B' ratings
* </td>
* </tr>
* <tr>
* <td>MX_TV_C</td>
* <td>Designed to be viewed by adults aged 18 or older only, generally more intensive
- * </td>
+ * content</td>
* </tr>
* <tr>
* <td>MX_TV_D</td>
* <td>Designed to be viewed only by mature adults (at least 21 years of age and over),
- * extreme content matter</td>
+ * contains extreme content matter</td>
* </tr>
* <tr>
* <td>MX_TV_RC</td>
* <td>Banned from public television in Mexico</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">MY_TV</td>
* <td>MY_TV_U</td>
* <td>General viewing for all ages, can be broadcast anytime</td>
* </tr>
* <tr>
* <td>MY_TV_P13</td>
* <td>For viewers ages 13 and above, children under 13 needs parental guidance, can be
- * anytime, but some elements may only be broadcast at night</td>
+ * broadcast anytime, but some elements may only be broadcast at night</td>
* </tr>
* <tr>
* <td>MY_TV_18</td>
* <td>For viewers ages 18 and above only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">NL_TV</td>
* <td>NL_TV_AL</td>
* <td>All Ages</td>
* </tr>
@@ -922,23 +995,25 @@
* <td>Parental advisory for children under 16</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">NZ_FTV</td>
* <td>NZ_FTV_G</td>
* <td>These exclude material likely to harm children under 14 and can screen at any time.
- * may not necessarily be designed for younger viewers, but must not contain material likely
- * cause them undue distress or discomfort</td>
+ * Programmes may not necessarily be designed for younger viewers, but must not contain
+ * material likely to cause them undue distress or discomfort</td>
* </tr>
* <tr>
* <td>NZ_FTV_PGR</td>
* <td>Programmes more suited to more mature viewers. These are not necessarily unsuitable
- * children, but viewer discretion is advised, and parents and guardians are encouraged to
- * younger viewers</td>
+ * for children, but viewer discretion is advised, and parents and guardians are encouraged
+ * to supervise younger viewers</td>
* </tr>
* <tr>
* <td>NZ_FTV_AO</td>
* <td>Contain material of an adult nature handled in such a way that it is unsuitable for
- * </td>
+ * children</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">NZ_PTV</td>
* <td>NZ_PTV_G</td>
* <td>suitable for general audiences</td>
* </tr>
@@ -959,6 +1034,7 @@
* <td>Suitable for viewers 18 and up</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">PE_TV</td>
* <td>PE_TV_A</td>
* <td>Suitable for all audiences</td>
* </tr>
@@ -971,6 +1047,7 @@
* <td>Suitable for people aged 18 and above only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">PE_ATV</td>
* <td>PE_ATV_GP</td>
* <td>General audience</td>
* </tr>
@@ -987,48 +1064,52 @@
* <td>Suitable for people aged 18 and above only</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">PH_TV</td>
* <td>PH_TV_G</td>
* <td>Suitable for all public viewers</td>
* </tr>
* <tr>
* <td>PH_TV_PG</td>
* <td>Programmes rated PG may contain scenes or other content that are unsuitable for
- * without the guidance of a parent</td>
+ * children without the guidance of a parent</td>
* </tr>
* <tr>
* <td>PH_TV_SPG</td>
* <td>Contains mature themes or moderate to intense violence, which may be deemed unfit for
- * to watch without strict parental supervision</td>
+ * children to watch without strict parental supervision</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">PL_TV</td>
* <td>PL_TV_G</td>
* <td>Positive or neutral view of the world, little to no violence, non-sexual love, and no
- * content</td>
+ * sexual content</td>
* </tr>
* <tr>
* <td>PL_TV_7</td>
* <td>Age 7 and above. May additionally contain some mild language, bloodless violence, and
- * more negative view of the world</td>
+ * a more negative view of the world</td>
* </tr>
* <tr>
* <td>PL_TV_12</td>
* <td>Age 12 and above. May contain some foul language, some violence, and some sexual
- * </td>
+ * content</td>
* </tr>
* <tr>
* <td>PL_TV_16</td>
* <td>Age 16 and above. Deviant social behaviour, world filled with violence and sexuality,
- * picture of adulthood, display of physical force, especially in controversial social
- * immoral behaviour without ethic dilemma, putting the blame on the victim, excessive
- * on material possessions</td>
+ * simplified picture of adulthood, display of physical force, especially in controversial
+ * social context, immoral behaviour without ethic dilemma, putting the blame on the victim,
+ * excessive concentration on material possessions</td>
* </tr>
* <tr>
* <td>PL_TV_18</td>
* <td>Age 18 and above. One-sided display of the joys of adult life without showing
- * social justification of violent behaviour, excessive vulgarity, use of racial slurs and
- * stereotypes, explicit sexual content, praise of aggression or vulgarity</td>
+ * responsibilities, social justification of violent behaviour, excessive vulgarity, use of
+ * racial slurs and social stereotypes, explicit sexual content, praise of aggression or
+ * vulgarity</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">PT_TV</td>
* <td>PT_TV_T</td>
* <td>Suitable for all</td>
* </tr>
@@ -1045,6 +1126,7 @@
* <td>Not suitable for children under 16</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">RO_TV</td>
* <td>RO_TV_Y</td>
* <td>Young Ages</td>
* </tr>
@@ -1069,6 +1151,7 @@
* <td>Forbidden for children under 18 years of age</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="5">RU_TV</td>
* <td>RU_TV_0</td>
* <td>Can be watched by Any Age</td>
* </tr>
@@ -1089,6 +1172,7 @@
* <td>Restricted to children ONLY people 18 or older</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="7">RS_TV</td>
* <td>RS_TV_G</td>
* <td>Program suitable for all ages</td>
* </tr>
@@ -1117,14 +1201,16 @@
* <td>Program not suitable for minors under the age of 18</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="2">SG_FTV</td>
* <td>SG_FTV_PG</td>
* <td>Suitable for most but parents should guide their young</td>
* </tr>
* <tr>
* <td>SG_FTV_PG13</td>
- * <td>Parental Guidance Strongly Cautioned – Suitable for 13 And Above</td>
+ * <td>Parental Guidance Strongly Cautioned - Suitable for 13 And Above</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="2">SG_PTV</td>
* <td>SG_PTV_NC16</td>
* <td>No Children Under 16</td>
* </tr>
@@ -1133,6 +1219,7 @@
* <td>Nobody under age 18 is admitted</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">SI_TV</td>
* <td>SI_TV_VS</td>
* <td>Parental guidance suggested (for children under 6)</td>
* </tr>
@@ -1149,12 +1236,13 @@
* <td>Content exclusively for adults</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">TH_TV</td>
* <td>TH_TV_P</td>
* <td>Content suitable for primary school aged children</td>
* </tr>
* <tr>
* <td>TH_TV_C</td>
- * <td>Content suitable for children between 6–12 years old</td>
+ * <td>Content suitable for children between 6-12 years old</td>
* </tr>
* <tr>
* <td>TH_TV_G</td>
@@ -1163,18 +1251,19 @@
* <tr>
* <td>TH_TV_PG13</td>
* <td>Content suitable for people aged 13 and above, but can be watched by those who are
- * the recommended age if parental guidance is provided</td>
+ * under the recommended age if parental guidance is provided</td>
* </tr>
* <tr>
* <td>TH_TV_PG18</td>
* <td>Content suitable for people aged above 18 years old; those who are younger that 18
- * be provided with parental guidance</td>
+ * must be provided with parental guidance</td>
* </tr>
* <tr>
* <td>TH_TV_A</td>
* <td>Content unsuitable for children and youngsters</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">TR_TV</td>
* <td>TR_TV_G</td>
* <td>General audience. Suitable for all ages</td>
* </tr>
@@ -1191,65 +1280,69 @@
* <td>Suitable for ages 13 and over</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">TW_TV</td>
* <td>TW_TV_G</td>
* <td>For all ages</td>
* </tr>
* <tr>
* <td>TW_TV_P</td>
* <td>Not suitable for children under 6 years old. People aged 6 but under 12 require
- * from accompanying adults to watch</td>
+ * guidance from accompanying adults to watch</td>
* </tr>
* <tr>
* <td>TW_TV_PG</td>
* <td>Not suitable for people under 12 years of age. Parental guidance is required for
- * aged 12 but under 18</td>
+ * people aged 12 but under 18</td>
* </tr>
* <tr>
* <td>TW_TV_R</td>
* <td>For adults only and people under 18 years of age must not watch</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">UA_TV</td>
* <td>UA_TV_G</td>
* <td>This program does not have age restrictions</td>
* </tr>
* <tr>
* <td>UA_TV_Y</td>
* <td>Children must view this program with parents. In it program there are fragments,
- * unsuitable for children</td>
+ * which unsuitable for children</td>
* </tr>
* <tr>
* <td>UA_TV_R</td>
* <td>This program is only for adult viewers. In it there are scenes with nudity, drug use,
- * violence</td>
+ * or violence</td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_Y</td>
+ * <td valign="top" rowspan="6">US_TV</td>
+ * <td>US_TV_Y</td>
* <td>This program is designed to be appropriate for all children</td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_Y7</td>
+ * <td>US_TV_Y7</td>
* <td>This program is designed for children age 7 and above</td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_G</td>
+ * <td>US_TV_G</td>
* <td>Most parents would find this program suitable for all ages</td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_PG</td>
+ * <td>US_TV_PG</td>
* <td>This program contains material that parents may find unsuitable for younger children
* </td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_14</td>
+ * <td>US_TV_14</td>
* <td>This program contains some material that many parents would find unsuitable for
- * under 14 years of age</td>
+ * children under 14 years of age</td>
* </tr>
* <tr>
- * <td>US_TVPG_TV_MA</td>
+ * <td>US_TV_MA</td>
* <td>This program is specifically designed to be viewed by adults and therefore may be
- * for children under 17</td>
+ * unsuitable for children under 17</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="3">VE_TV</td>
* <td>VE_TV_TU</td>
* <td>For all ages</td>
* </tr>
@@ -1262,139 +1355,153 @@
* <td>Mature viewers</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">ZA_TV</td>
* <td>ZA_TV_F</td>
* <td>This is a program/film that does not contain any obscenity, and is suitable for
- * viewing. A logo must be displayed in the corner of the screen for 30 seconds after each
- * break</td>
+ * family viewing. A logo must be displayed in the corner of the screen for 30 seconds after
+ * each commercial break</td>
* </tr>
* <tr>
* <td>ZA_TV_PG</td>
* <td>Children under 6 may watch this program/film, but must be accompanied by an adult.
- * program contains an adult related theme, which might include very mild language, violence
- * sexual innuendo. A logo must be displayed in the corner of the screen for one minute
- * each commercial break</td>
+ * This program contains an adult related theme, which might include very mild language,
+ * violence and sexual innuendo. A logo must be displayed in the corner of the screen for
+ * one minute after each commercial break</td>
* </tr>
* <tr>
* <td>ZA_TV_13</td>
* <td>Children under 13 are prohibited from watching this program/film. This program
- * mild language, violence and sexual innuendo. A logo must be displayed in the corner of
- * screen for two minutes after each commercial break</td>
+ * contains mild language, violence and sexual innuendo. A logo must be displayed in the
+ * corner of the screen for two minutes after each commercial break</td>
* </tr>
* <tr>
* <td>ZA_TV_16</td>
* <td>Children under 16 are prohibited from watching this program/film. It contains
- * violence, language, and some sexual situations. In the case of television, this program
- * only be broadcast after 9pm–4:30am. A logo must be displayed in the corner of the screen
- * five minutes after each commercial break. A full-screen warning must be issued before the
- * of the program. If the program is longer than an hour, a warning must be displayed every
- * an hour</td>
+ * moderate violence, language, and some sexual situations. In the case of television, this
+ * program may only be broadcast after 9pm-4:30am. A logo must be displayed in the corner of
+ * the screen for five minutes after each commercial break. A full-screen warning must be
+ * issued before the start of the program. If the program is longer than an hour, a warning
+ * must be displayed every half an hour</td>
* </tr>
* <tr>
* <td>ZA_TV_18</td>
* <td>Children under 18 are prohibited from watching this program/film. It contains extreme
- * language and/or graphic sexual content. In the case of television, this program may only
- * broadcast from 10pm–4:30am. A logo must be displayed in the corner of the screen for the
- * of the program. A full-screen warning must be issued before the start of the program and
- * each commercial break</td>
+ * violence, language and/or graphic sexual content. In the case of television, this program
+ * may only be broadcast from 10pm-4:30am. A logo must be displayed in the corner of the
+ * screen for the duration of the program. A full-screen warning must be issued before the
+ * start of the program and after each commercial break</td>
* </tr>
* <tr>
* <td>ZA_TV_R18</td>
* <td>This is reserved for films of an extreme sexual nature (pornography). R18 films may
- * be distributed in the form of video and DVD in a controlled environment (e.g. Adult
- * No public viewing of this film may take place. R18 films may not be broadcast on
- * and in cinemas</td>
+ * only be distributed in the form of video and DVD in a controlled environment (e.g. Adult
+ * Shops). No public viewing of this film may take place. R18 films may not be broadcast on
+ * television and in cinemas</td>
* </tr>
* </table>
*
* <u>System defined string for {@code subRating}</u>
- * <table border="0" cellspacing="0" cellpadding="0">
+ * <table border="1" cellspacing="0" cellpadding="0">
* <tr>
- * <td width=10%>String value</td>
+ * <td width="10%">RatingSystem code</td>
+ * <td width="10%">Rating string value</td>
* <td>Comments</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">NL_TV</td>
* <td>NL_TV_V</td>
- * <td>Violence</td>
+ * <td>Violence<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td>
* </tr>
* <tr>
* <td>NL_TV_F</td>
- * <td>Scary or Disturbing Content</td>
+ * <td>Scary or Disturbing ContentViolence<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9,
+ * NL_TV_12, NL_TV_16</td>
* </tr>
* <tr>
* <td>NL_TV_S</td>
- * <td>Sexual Content</td>
+ * <td>Sexual Content<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td>
* </tr>
* <tr>
* <td>NL_TV_D</td>
- * <td>Discrimination</td>
+ * <td>Discrimination<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td>
* </tr>
* <tr>
* <td>NL_TV_DA</td>
- * <td>Drug and/or Alcohol abuse</td>
+ * <td>Drug and/or Alcohol abuse<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12,
+ * NL_TV_16</td>
* </tr>
* <tr>
* <td>NL_TV_L</td>
- * <td>Bad Language</td>
+ * <td>Bad Language<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="4">NZ_PTV</td>
* <td>NZ_PTV_C</td>
- * <td>Content may offend</td>
+ * <td>Content may offend<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td>
* </tr>
* <tr>
* <td>NZ_PTV_V</td>
- * <td>Violence</td>
+ * <td>Violence<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td>
* </tr>
* <tr>
* <td>NZ_PTV_L</td>
- * <td>Language</td>
+ * <td>Language<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td>
* </tr>
* <tr>
* <td>NZ_PTV_S</td>
- * <td>Sexual content</td>
+ * <td>Sexual content<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td>
* </tr>
* <tr>
- * <td>US_TVPG_D</td>
- * <td>Suggestive dialogue (Usually means talks about sex)</td>
+ * <td valign="top" rowspan="5">US_TV</td>
+ * <td>US_TV_D</td>
+ * <td>Suggestive dialogue (Usually means talks about sex)<br/>Applicable to US_TV_PG,
+ * US_TV_14, US_TV</td>
* </tr>
* <tr>
- * <td>US_TVPG_L</td>
- * <td>Coarse language</td>
+ * <td>US_TV_L</td>
+ * <td>Coarse language<br/>Applicable to US_TV_PG, US_TV_14</td>
* </tr>
* <tr>
- * <td>US_TVPG_S</td>
- * <td>Sexual content</td>
+ * <td>US_TV_S</td>
+ * <td>Sexual content<br/>Applicable to US_TV_PG, US_TV_14, US_TV_MA</td>
* </tr>
* <tr>
- * <td>US_TVPG_V</td>
- * <td>Violence</td>
+ * <td>US_TV_V</td>
+ * <td>Violence<br/>Applicable to US_TV_PG, US_TV_14, US_TV_MA</td>
* </tr>
* <tr>
- * <td>US_TVPG_FV</td>
- * <td>Fantasy violence (Children\'s programming only)</td>
+ * <td>US_TV_FV</td>
+ * <td>Fantasy violence (Children's programming only)<br/>Applicable to US_TV_Y7</td>
* </tr>
* <tr>
+ * <td valign="top" rowspan="6">ZA_TV</td>
* <td>ZA_TV_D</td>
- * <td>Drug</td>
+ * <td>Drug<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18
+ * </td>
* </tr>
* <tr>
* <td>ZA_TV_V</td>
- * <td>Violence</td>
+ * <td>Violence<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18
+ * </td>
* </tr>
* <tr>
* <td>ZA_TV_N</td>
- * <td>Nudity</td>
+ * <td>Nudity<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18
+ * </td>
* </tr>
* <tr>
* <td>ZA_TV_P</td>
- * <td>Prejudice</td>
+ * <td>Prejudice<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18,
+ * ZA_TV_R18</td>
* </tr>
* <tr>
* <td>ZA_TV_S</td>
- * <td>Sex</td>
+ * <td>Sex<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</td>
* </tr>
* <tr>
* <td>ZA_TV_L</td>
- * <td>Language</td>
+ * <td>Language<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18
+ * </td>
* </tr>
* </table>
*/
@@ -1480,7 +1587,7 @@
Arrays.sort(subRatings);
mSubRatings = subRatings;
}
- mHashCode = Objects.hash(mDomain, mRating, mSubRatings);
+ mHashCode = 31 * Objects.hash(mDomain, mRating) + Arrays.hashCode(mSubRatings);
}
/**
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index e975676..bdceb24 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -119,12 +119,12 @@
}
/**
- * Build a special channel URI intended to be used with pass-through type inputs. (e.g. HDMI)
+ * Build a special channel URI intended to be used with pass-through inputs. (e.g. HDMI)
*
- * @param inputId The ID of the TV input to build a channels URI for.
- * @see TvInputInfo#isPassthroughInputType()
+ * @param inputId The ID of the pass-through input to build a channels URI for.
+ * @see TvInputInfo#isPassthroughInput()
*/
- public static final Uri buildChannelUriForPassthroughTvInput(String inputId) {
+ public static final Uri buildChannelUriForPassthroughInput(String inputId) {
return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(AUTHORITY)
.appendPath(PATH_PASSTHROUGH).appendPath(inputId).build();
}
@@ -144,7 +144,7 @@
* @param channelUri The URI of the channel whose logo is pointed to.
*/
public static final Uri buildChannelLogoUri(Uri channelUri) {
- if (!isChannelUriForTunerTvInput(channelUri)) {
+ if (!isChannelUriForTunerInput(channelUri)) {
throw new IllegalArgumentException("Not a channel: " + channelUri);
}
return Uri.withAppendedPath(channelUri, Channels.Logo.CONTENT_DIRECTORY);
@@ -153,7 +153,8 @@
/**
* Builds a URI that points to all channels from a given TV input.
*
- * @param inputId The ID of the TV input to build a channels URI for.
+ * @param inputId The ID of the TV input to build a channels URI for. If {@code null}, builds a
+ * URI for all the TV inputs.
*/
public static final Uri buildChannelsUriForInput(String inputId) {
return buildChannelsUriForInput(inputId, false);
@@ -162,43 +163,46 @@
/**
* Builds a URI that points to all or browsable-only channels from a given TV input.
*
- * @param inputId The ID of the TV input to build a channels URI for.
+ * @param inputId The ID of the TV input to build a channels URI for. If {@code null}, builds a
+ * URI for all the TV inputs.
* @param browsableOnly If set to {@code true} the URI points to only browsable channels. If set
* to {@code false} the URI points to all channels regardless of whether they are
* browsable or not.
* @hide
*/
+ @SystemApi
public static final Uri buildChannelsUriForInput(String inputId, boolean browsableOnly) {
- return Channels.CONTENT_URI.buildUpon()
- .appendQueryParameter(PARAM_INPUT, inputId)
- .appendQueryParameter(PARAM_BROWSABLE_ONLY, String.valueOf(browsableOnly)).build();
+ Uri.Builder builder = Channels.CONTENT_URI.buildUpon();
+ if (inputId != null) {
+ builder.appendQueryParameter(PARAM_INPUT, inputId);
+ }
+ return builder.appendQueryParameter(PARAM_BROWSABLE_ONLY, String.valueOf(browsableOnly))
+ .build();
}
/**
* Builds a URI that points to all or browsable-only channels which have programs with the given
* genre from the given TV input.
*
- * @param inputId The ID of the TV input to build a channels URI for. If null, builds a URI for
- * all the TV inputs.
- * @param genre {@link Programs.Genres} to search.
+ * @param inputId The ID of the TV input to build a channels URI for. If {@code null}, builds a
+ * URI for all the TV inputs.
+ * @param genre {@link Programs.Genres} to search. If {@code null}, builds a URI for all genres.
* @param browsableOnly If set to {@code true} the URI points to only browsable channels. If set
* to {@code false} the URI points to all channels regardless of whether they are
* browsable or not.
* @hide
*/
- public static final Uri buildChannelsUriForCanonicalGenre(String inputId, String genre,
+ @SystemApi
+ public static final Uri buildChannelsUriForInput(String inputId, String genre,
boolean browsableOnly) {
+ if (genre == null) {
+ return buildChannelsUriForInput(inputId, browsableOnly);
+ }
if (!Programs.Genres.isCanonical(genre)) {
throw new IllegalArgumentException("Not a canonical genre: '" + genre + "'");
}
-
- Uri uri;
- if (inputId == null) {
- uri = Channels.CONTENT_URI;
- } else {
- uri = buildChannelsUriForInput(inputId, browsableOnly);
- }
- return uri.buildUpon().appendQueryParameter(PARAM_CANONICAL_GENRE, genre).build();
+ return buildChannelsUriForInput(inputId, browsableOnly).buildUpon()
+ .appendQueryParameter(PARAM_CANONICAL_GENRE, genre).build();
}
/**
@@ -226,7 +230,7 @@
* @param channelUri The URI of the channel to return programs for.
*/
public static final Uri buildProgramsUriForChannel(Uri channelUri) {
- if (!isChannelUriForTunerTvInput(channelUri)) {
+ if (!isChannelUriForTunerInput(channelUri)) {
throw new IllegalArgumentException("Not a channel: " + channelUri);
}
return buildProgramsUriForChannel(ContentUris.parseId(channelUri));
@@ -261,7 +265,7 @@
*/
public static final Uri buildProgramsUriForChannel(Uri channelUri, long startTime,
long endTime) {
- if (!isChannelUriForTunerTvInput(channelUri)) {
+ if (!isChannelUriForTunerInput(channelUri)) {
throw new IllegalArgumentException("Not a channel: " + channelUri);
}
return buildProgramsUriForChannel(ContentUris.parseId(channelUri), startTime, endTime);
@@ -292,23 +296,23 @@
* @hide
*/
public static final boolean isChannelUri(Uri uri) {
- return isChannelUriForTunerTvInput(uri) || isChannelUriForPassthroughTvInput(uri);
+ return isChannelUriForTunerInput(uri) || isChannelUriForPassthroughInput(uri);
}
/**
- * Returns true, if {@code uri} is a channel URI for a tuner TV input.
+ * Returns true, if {@code uri} is a channel URI for a tuner input.
* @hide
*/
- public static final boolean isChannelUriForTunerTvInput(Uri uri) {
+ public static final boolean isChannelUriForTunerInput(Uri uri) {
return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_CHANNEL);
}
/**
- * Returns true, if {@code uri} is a channel URI for a passthrough TV input.
+ * Returns true, if {@code uri} is a channel URI for a passthrough input.
* @hide
*/
@SystemApi
- public static final boolean isChannelUriForPassthroughTvInput(Uri uri) {
+ public static final boolean isChannelUriForPassthroughInput(Uri uri) {
return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PASSTHROUGH);
}
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index e735e4e..3f5697f 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -38,7 +38,6 @@
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
-import android.util.Pair;
import android.util.SparseIntArray;
import android.util.Xml;
@@ -47,9 +46,11 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
/**
* This class is used to specify meta information of a TV input.
@@ -112,7 +113,7 @@
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_LOGICAL_ADDRESS = 2;
+ private static final int LENGTH_HDMI_DEVICE_ID = 2;
private final ResolveInfo mService;
private final String mId;
@@ -157,17 +158,17 @@
}
/**
- * Create a new instance of the TvInputInfo class,
- * instantiating it from the given Context, ResolveInfo, and HdmiDeviceInfo.
+ * Create a new instance of the TvInputInfo class, instantiating it from the given Context,
+ * ResolveInfo, and HdmiDeviceInfo.
*
* @param service The ResolveInfo returned from the package manager about this TV input service.
* @param deviceInfo The HdmiDeviceInfo for a HDMI CEC logical device.
* @param parentId The ID of this TV input's parent input. {@code null} if none exists.
- * @param iconUri The {@link android.net.Uri} to load the icon image.
- * {@see android.content.ContentResolver#openInputStream}. If it is null, the application
- * icon of {@code service} will be loaded.
- * @param label The label of this TvInputInfo. If it is null or empty, {@code service} label
- * will be loaded.
+ * @param iconUri The {@link android.net.Uri} to load the icon image. See
+ * {@link android.content.ContentResolver#openInputStream}. If it is {@code null},
+ * the application icon of {@code service} will be loaded.
+ * @param label The label of this TvInputInfo. If it is {@code null} or empty, {@code service}
+ * label will be loaded.
* @hide
*/
@SystemApi
@@ -181,16 +182,16 @@
}
/**
- * Create a new instance of the TvInputInfo class,
- * instantiating it from the given Context, ResolveInfo, and TvInputHardwareInfo.
+ * Create a new instance of the TvInputInfo class, instantiating it from the given Context,
+ * ResolveInfo, and TvInputHardwareInfo.
*
* @param service The ResolveInfo returned from the package manager about this TV input service.
* @param hardwareInfo The TvInputHardwareInfo for a TV input hardware device.
- * @param iconUri The {@link android.net.Uri} to load the icon image.
- * {@see android.content.ContentResolver#openInputStream}. If it is null, the application
- * icon of {@code service} will be loaded.
- * @param label The label of this TvInputInfo. If it is null or empty, {@code service} label
- * will be loaded.
+ * @param iconUri The {@link android.net.Uri} to load the icon image. See
+ * {@link android.content.ContentResolver#openInputStream}. If it is {@code null},
+ * the application icon of {@code service} will be loaded.
+ * @param label The label of this TvInputInfo. If it is {@code null} or empty, {@code service}
+ * label will be loaded.
* @hide
*/
@SystemApi
@@ -245,17 +246,17 @@
Log.d(TAG, "Settings activity loaded. [" + input.mSettingsActivity + "] for "
+ si.name);
}
- int contentRatingSystemXml = sa.getResourceId(
- com.android.internal.R.styleable.TvInputService_contentRatingSystemXml, -1);
- if (contentRatingSystemXml != -1) {
+ int tvContentRatingDescription = sa.getResourceId(
+ com.android.internal.R.styleable.TvInputService_tvContentRatingDescription, -1);
+ if (tvContentRatingDescription != -1) {
input.mRatingSystemXmlUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(si.packageName)
- .appendPath(Integer.toString(contentRatingSystemXml))
+ .appendPath(Integer.toString(tvContentRatingDescription))
.build();
if (DEBUG) {
- Log.d(TAG, "Content rating xml loaded. [" + contentRatingSystemXml + "] for "
- + si.name);
+ Log.d(TAG, "Content rating xml loaded. [" + tvContentRatingDescription
+ + "] for " + si.name);
}
}
sa.recycle();
@@ -379,9 +380,9 @@
* Returns {@code true} if this TV input is pass-though which does not have any real channels
* in TvProvider. {@code false} otherwise.
*
- * @see TvContract#buildChannelUriForPassthroughTvInput(String)
+ * @see TvContract#buildChannelUriForPassthroughInput(String)
*/
- public boolean isPassthroughInputType() {
+ public boolean isPassthroughInput() {
return mType != TYPE_TUNER;
}
@@ -405,7 +406,7 @@
*/
@SystemApi
public boolean isHidden(Context context) {
- return TvInputSettings.isHidden(context, mId, UserHandle.USER_CURRENT);
+ return TvInputSettings.isHidden(context, mId, UserHandle.myUserId());
}
/**
@@ -433,7 +434,7 @@
*/
@SystemApi
public CharSequence loadCustomLabel(Context context) {
- return TvInputSettings.getCustomLabel(context, mId, UserHandle.USER_CURRENT);
+ return TvInputSettings.getCustomLabel(context, mId, UserHandle.myUserId());
}
/**
@@ -536,9 +537,9 @@
ComponentName name, HdmiDeviceInfo deviceInfo) {
// Example of the format : "/HDMI%04X%02X"
String format = String.format("%s%s%%0%sX%%0%sX", DELIMITER_INFO_IN_ID, PREFIX_HDMI_DEVICE,
- LENGTH_HDMI_PHYSICAL_ADDRESS, LENGTH_HDMI_LOGICAL_ADDRESS);
+ LENGTH_HDMI_PHYSICAL_ADDRESS, LENGTH_HDMI_DEVICE_ID);
return name.flattenToShortString() + String.format(format,
- deviceInfo.getPhysicalAddress(), deviceInfo.getLogicalAddress());
+ deviceInfo.getPhysicalAddress(), deviceInfo.getId());
}
/**
@@ -601,66 +602,61 @@
}
private static String getCustomLabel(Context context, String inputId, int userId) {
- for (Pair<String, String> pair : getCustomLabelList(context, userId)) {
- if (pair.first.equals(inputId)) {
- return pair.second;
- }
- }
- return null;
+ return getCustomLabels(context, userId).get(inputId);
}
/**
- * Returns a list of TV input IDs which are marked as hidden by user in the settings.
+ * Returns a set of TV input IDs which are marked as hidden by user in the settings.
*
* @param context The application context
- * @param userId The user ID for the stored hidden input list
+ * @param userId The user ID for the stored hidden input set
* @hide
*/
@SystemApi
- public static List<String> getHiddenTvInputIds(Context context, int userId) {
+ public static Set<String> getHiddenTvInputIds(Context context, int userId) {
String hiddenIdsString = Settings.Secure.getStringForUser(
context.getContentResolver(), Settings.Secure.TV_INPUT_HIDDEN_INPUTS, userId);
if (TextUtils.isEmpty(hiddenIdsString)) {
- return new ArrayList<String>();
+ return new HashSet<String>();
}
String[] ids = hiddenIdsString.split(TV_INPUT_SEPARATOR);
- return new ArrayList(Arrays.asList(ids));
+ return new HashSet<>(Arrays.asList(ids));
}
/**
- * Returns a list of TV input ID/custom label pairs set by the user in the settings.
+ * Returns a map of TV input ID/custom label pairs set by the user in the settings.
*
* @param context The application context
- * @param userId The user ID for the stored hidden input list
+ * @param userId The user ID for the stored hidden input map
* @hide
*/
@SystemApi
- public static List<Pair<String, String>> getCustomLabelList(Context context, int userId) {
+ public static Map<String, String> getCustomLabels(Context context, int userId) {
String labelsString = Settings.Secure.getStringForUser(
context.getContentResolver(), Settings.Secure.TV_INPUT_CUSTOM_LABELS, userId);
- List<Pair<String, String>> list = new ArrayList<Pair<String, String>>();
+ Map<String, String> map = new HashMap<String, String>();
if (TextUtils.isEmpty(labelsString)) {
- return list;
+ return map;
}
String[] pairs = labelsString.split(TV_INPUT_SEPARATOR);
for (String pairString : pairs) {
String[] pair = pairString.split(CUSTOM_NAME_SEPARATOR);
- list.add(new Pair<String, String>(pair[0], pair[1]));
+ map.put(pair[0], pair[1]);
}
- return list;
+ return map;
}
/**
- * Stores a list of TV input IDs which are marked as hidden by user. This is expected to
+ * Stores a set of TV input IDs which are marked as hidden by user. This is expected to
* be called from the settings app.
*
* @param context The application context
- * @param hiddenInputIds A list including all the hidden TV input IDs
- * @param userId The user ID for the stored hidden input list
+ * @param hiddenInputIds A set including all the hidden TV input IDs
+ * @param userId The user ID for the stored hidden input set
* @hide
*/
@SystemApi
- public static void putHiddenTvInputList(Context context, List<String> hiddenInputIds,
+ public static void putHiddenTvInputs(Context context, Set<String> hiddenInputIds,
int userId) {
StringBuilder builder = new StringBuilder();
boolean firstItem = true;
@@ -678,30 +674,30 @@
}
/**
- * Stores a list of TV input ID/custom label pairs set by user. This is expected to be
+ * Stores a map of TV input ID/custom label set by user. This is expected to be
* called from the settings app.
*
* @param context The application context.
- * @param customLabels A list of TV input ID/custom label pairs
- * @param userId The user ID for the stored hidden input list
+ * @param customLabels A map of TV input ID/custom label pairs
+ * @param userId The user ID for the stored hidden input map
* @hide
*/
@SystemApi
- public static void putCustomLabelList(Context context,
- List<Pair<String, String>> customLabels, int userId) {
+ public static void putCustomLabels(Context context,
+ Map<String, String> customLabels, int userId) {
StringBuilder builder = new StringBuilder();
boolean firstItem = true;
- for (Pair<String, String> pair : customLabels) {
- ensureValidField(pair.first);
- ensureValidField(pair.second);
+ for (Map.Entry<String, String> entry: customLabels.entrySet()) {
+ ensureValidField(entry.getKey());
+ ensureValidField(entry.getValue());
if (firstItem) {
firstItem = false;
} else {
builder.append(TV_INPUT_SEPARATOR);
}
- builder.append(pair.first);
+ builder.append(entry.getKey());
builder.append(CUSTOM_NAME_SEPARATOR);
- builder.append(pair.second);
+ builder.append(entry.getValue());
}
Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.TV_INPUT_CUSTOM_LABELS, builder.toString(), userId);
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 6e075b2..45aa6d6 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -235,14 +235,14 @@
}
/**
- * This is called when {@link TvInputService.Session#layoutSurface} is called to
- * change the layout of surface.
+ * This is called when {@link TvInputService.Session#layoutSurface} is called to change the
+ * layout of surface.
*
* @param session A {@link TvInputManager.Session} associated with this callback
- * @param l Left position.
- * @param t Top position.
- * @param r Right position.
- * @param b Bottom position.
+ * @param left Left position.
+ * @param top Top position.
+ * @param right Right position.
+ * @param bottom Bottom position.
* @hide
*/
@SystemApi
@@ -1023,10 +1023,12 @@
}
/**
- * Sets this as main session. See {@link TvView#setMainTvView} for about meaning of "main".
- * @hide
+ * Sets this as the main session. The main session is a session whose corresponding TV
+ * input determines the HDMI-CEC active source device.
+ *
+ * @see TvView#setMain
*/
- public void setMainSession() {
+ void setMain() {
if (mToken == null) {
Log.w(TAG, "The session has been already released");
return;
@@ -1164,7 +1166,7 @@
* {@link TvTrackInfo#TYPE_SUBTITLE}.
* @param trackId The ID of the track to select. When {@code null}, the currently selected
* track of the given type will be unselected.
- * @see #getTracks()
+ * @see #getTracks
*/
public void selectTrack(int type, String trackId) {
if (type == TvTrackInfo.TYPE_AUDIO) {
@@ -1339,6 +1341,9 @@
Log.w(TAG, "The session has been already released");
return;
}
+ if (unblockedRating == null) {
+ throw new IllegalArgumentException("unblockedRating cannot be null");
+ }
try {
mService.requestUnblockContent(mToken, unblockedRating.flattenToString(), mUserId);
} catch (RemoteException e) {
@@ -1462,14 +1467,14 @@
// Assumes the event has already been removed from the queue.
void invokeFinishedInputEventCallback(PendingEvent p, boolean handled) {
p.mHandled = handled;
- if (p.mHandler.getLooper().isCurrentThread()) {
+ if (p.mEventHandler.getLooper().isCurrentThread()) {
// Already running on the callback handler thread so we can send the callback
// immediately.
p.run();
} else {
// Post the event to the callback handler thread.
// In this case, the callback will be responsible for recycling the event.
- Message msg = Message.obtain(p.mHandler, p);
+ Message msg = Message.obtain(p.mEventHandler, p);
msg.setAsynchronous(true);
msg.sendToTarget();
}
@@ -1494,9 +1499,9 @@
p = new PendingEvent();
}
p.mEvent = event;
- p.mToken = token;
+ p.mEventToken = token;
p.mCallback = callback;
- p.mHandler = handler;
+ p.mEventHandler = handler;
return p;
}
@@ -1568,24 +1573,24 @@
private final class PendingEvent implements Runnable {
public InputEvent mEvent;
- public Object mToken;
+ public Object mEventToken;
public FinishedInputEventCallback mCallback;
- public Handler mHandler;
+ public Handler mEventHandler;
public boolean mHandled;
public void recycle() {
mEvent = null;
- mToken = null;
+ mEventToken = null;
mCallback = null;
- mHandler = null;
+ mEventHandler = null;
mHandled = false;
}
@Override
public void run() {
- mCallback.onFinishedInputEvent(mToken, mHandled);
+ mCallback.onFinishedInputEvent(mEventToken, mHandled);
- synchronized (mHandler) {
+ synchronized (mEventHandler) {
recyclePendingEventLocked(this);
}
}
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 8783648..e3292b6 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -94,6 +94,8 @@
private final RemoteCallbackList<ITvInputServiceCallback> mCallbacks =
new RemoteCallbackList<ITvInputServiceCallback>();
+ private TvInputManager mTvInputManager;
+
@Override
public final IBinder onBind(Intent intent) {
return new ITvInputService.Stub() {
@@ -213,7 +215,7 @@
}
/**
- * Returns the input ID for {@code logicalAddress} if it is handled by this service; otherwise,
+ * Returns the input ID for {@code deviceInfo} if it is handled by this service; otherwise,
* return {@code null}. Override to modify default behavior of ignoring all HDMI logical input
* device.
*
@@ -225,6 +227,17 @@
return null;
}
+ private boolean isPassthroughInput(String inputId) {
+ if (mTvInputManager == null) {
+ mTvInputManager = (TvInputManager) getSystemService(Context.TV_INPUT_SERVICE);
+ }
+ TvInputInfo info = mTvInputManager.getTvInputInfo(inputId);
+ if (info != null && info.isPassthroughInput()) {
+ return true;
+ }
+ return false;
+ }
+
/**
* Base class for derived classes to implement to provide a TV input session.
*/
@@ -504,12 +517,13 @@
/**
* Assigns a position of the {@link Surface} passed by {@link #onSetSurface}. The position
- * is relative to an overlay view. {@see #onOverlayViewSizeChanged}.
+ * is relative to an overlay view.
*
* @param left Left position in pixels, relative to the overlay view.
* @param top Top position in pixels, relative to the overlay view.
* @param right Right position in pixels, relative to the overlay view.
* @param bottm Bottom position in pixels, relative to the overlay view.
+ * @see #onOverlayViewSizeChanged
* @hide
*/
@SystemApi
@@ -537,29 +551,30 @@
public abstract void onRelease();
/**
- * Set the current session as the "main" session. See {@link TvView#setMainTvView} for the
- * meaning of "main".
+ * Sets the current session as the main session. The main session is a session whose
+ * corresponding TV input determines the HDMI-CEC active source device.
* <p>
- * This is primarily for HDMI-CEC active source management. TV input service that manages
- * HDMI-CEC logical device should make sure not only to select the corresponding HDMI
- * logical device as source device on {@code onSetMainSession(true)}, but also to select
- * internal device on {@code onSetMainSession(false)}. Also, if surface is set to non-main
- * session, it needs to select internal device after temporarily selecting corresponding
- * HDMI logical device for set up.
+ * TV input service that manages HDMI-CEC logical device should implement {@link
+ * #onSetMain} to (1) select the corresponding HDMI logical device as the source device
+ * when {@code isMain} is {@code true}, and to (2) select the internal device (= TV itself)
+ * as the source device when {@code isMain} is {@code false} and the session is still main.
+ * Also, if a surface is passed to a non-main session and active source is changed to
+ * initiate the surface, the active source should be returned to the main session.
* </p><p>
- * It is guaranteed that {@code onSetMainSession(true)} for new session is called first,
- * and {@code onSetMainSession(false)} for old session is called afterwards. This allows
- * {@code onSetMainSession(false)} to be no-op when TV input service knows that the next
- * main session corresponds to another HDMI logical device. Practically, this implies that
- * one TV input service should handle all HDMI port and HDMI-CEC logical devices for smooth
- * active source transition.
+ * {@link TvView} guarantees that, when tuning involves a session transition, {@code
+ * onSetMain(true)} for new session is called first, {@code onSetMain(false)} for old
+ * session is called afterwards. This allows {@code onSetMain(false)} to be no-op when TV
+ * input service knows that the next main session corresponds to another HDMI logical
+ * device. Practically, this implies that one TV input service should handle all HDMI port
+ * and HDMI-CEC logical devices for smooth active source transition.
* </p>
*
- * @param isMainSession If true, session is main.
+ * @param isMain If true, session should become main.
+ * @see TvView#setMain
* @hide
*/
@SystemApi
- public void onSetMainSession(boolean isMainSession) {
+ public void onSetMain(boolean isMain) {
}
/**
@@ -827,10 +842,10 @@
}
/**
- * Calls {@link #onSetMainSession}.
+ * Calls {@link #onSetMain}.
*/
- void setMainSession(boolean isMainSession) {
- onSetMainSession(isMainSession);
+ void setMain(boolean isMain) {
+ onSetMain(isMain);
}
/**
@@ -1178,11 +1193,11 @@
mCallbacks.finishBroadcast();
}
- private void broadcastAddHdmiTvInput(int logicalAddress, TvInputInfo inputInfo) {
+ private void broadcastAddHdmiTvInput(int id, TvInputInfo inputInfo) {
int n = mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- mCallbacks.getBroadcastItem(i).addHdmiTvInput(logicalAddress, inputInfo);
+ mCallbacks.getBroadcastItem(i).addHdmiTvInput(id, inputInfo);
} catch (RemoteException e) {
Log.e(TAG, "Error while broadcasting.", e);
}
@@ -1228,9 +1243,14 @@
HardwareSession proxySession =
((HardwareSession) sessionImpl);
String harewareInputId = proxySession.getHardwareInputId();
- if (TextUtils.isEmpty(harewareInputId)) {
+ if (TextUtils.isEmpty(harewareInputId) ||
+ !isPassthroughInput(harewareInputId)) {
+ if (TextUtils.isEmpty(harewareInputId)) {
+ Log.w(TAG, "Hardware input id is not setup yet.");
+ } else {
+ Log.w(TAG, "Invalid hardware input id : " + harewareInputId);
+ }
sessionImpl.onRelease();
- Log.w(TAG, "Hardware input id is not setup yet.");
try {
cb.onSessionCreated(null, null);
} catch (RemoteException e) {
@@ -1238,7 +1258,6 @@
}
return;
}
- // TODO: check if the given ID is really hardware TV input.
proxySession.mProxySession = stub;
proxySession.mProxySessionCallback = cb;
proxySession.mServiceHandler = mServiceHandler;
@@ -1289,7 +1308,7 @@
HdmiDeviceInfo deviceInfo = (HdmiDeviceInfo) msg.obj;
TvInputInfo inputInfo = onHdmiDeviceAdded(deviceInfo);
if (inputInfo != null) {
- broadcastAddHdmiTvInput(deviceInfo.getLogicalAddress(), inputInfo);
+ broadcastAddHdmiTvInput(deviceInfo.getId(), inputInfo);
}
return;
}
diff --git a/media/java/android/media/tv/TvTrackInfo.java b/media/java/android/media/tv/TvTrackInfo.java
index 6ddb2a2..e0aacd6 100644
--- a/media/java/android/media/tv/TvTrackInfo.java
+++ b/media/java/android/media/tv/TvTrackInfo.java
@@ -46,10 +46,12 @@
private final int mAudioSampleRate;
private final int mVideoWidth;
private final int mVideoHeight;
+ private final float mVideoFrameRate;
private final Bundle mExtra;
private TvTrackInfo(int type, String id, String language, int audioChannelCount,
- int audioSampleRate, int videoWidth, int videoHeight, Bundle extra) {
+ int audioSampleRate, int videoWidth, int videoHeight, float videoFrameRate,
+ Bundle extra) {
mType = type;
mId = id;
mLanguage = language;
@@ -57,6 +59,7 @@
mAudioSampleRate = audioSampleRate;
mVideoWidth = videoWidth;
mVideoHeight = videoHeight;
+ mVideoFrameRate = videoFrameRate;
mExtra = extra;
}
@@ -68,6 +71,7 @@
mAudioSampleRate = in.readInt();
mVideoWidth = in.readInt();
mVideoHeight = in.readInt();
+ mVideoFrameRate = in.readFloat();
mExtra = in.readBundle();
}
@@ -137,6 +141,17 @@
}
/**
+ * Returns the frame rate of the video, in the unit of fps (frames per second). Valid only for
+ * {@link #TYPE_VIDEO} tracks.
+ */
+ public final float getVideoFrameRate() {
+ if (mType != TYPE_VIDEO) {
+ throw new IllegalStateException("Not a video track");
+ }
+ return mVideoFrameRate;
+ }
+
+ /**
* Returns the extra information about the current track.
*/
public final Bundle getExtra() {
@@ -163,6 +178,7 @@
dest.writeInt(mAudioSampleRate);
dest.writeInt(mVideoWidth);
dest.writeInt(mVideoHeight);
+ dest.writeFloat(mVideoFrameRate);
dest.writeBundle(mExtra);
}
@@ -190,6 +206,7 @@
private int mAudioSampleRate;
private int mVideoWidth;
private int mVideoHeight;
+ private float mVideoFrameRate;
private Bundle mExtra;
/**
@@ -279,6 +296,20 @@
}
/**
+ * Sets the frame rate of the video, in the unit fps (frames per rate). Valid only for
+ * {@link #TYPE_VIDEO} tracks.
+ *
+ * @param videoFrameRate The frame rate of the video.
+ */
+ public final Builder setVideoFrameRate(float videoFrameRate) {
+ if (mType != TYPE_VIDEO) {
+ throw new IllegalStateException("Not a video track");
+ }
+ mVideoFrameRate = videoFrameRate;
+ return this;
+ }
+
+ /**
* Sets the extra information about the current track.
*
* @param extra The extra information.
@@ -295,7 +326,7 @@
*/
public TvTrackInfo build() {
return new TvTrackInfo(mType, mId, mLanguage, mAudioChannelCount, mAudioSampleRate,
- mVideoWidth, mVideoHeight, mExtra);
+ mVideoWidth, mVideoHeight, mVideoFrameRate, mExtra);
}
}
}
\ No newline at end of file
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index 591f543..f348b9b 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -59,19 +59,6 @@
// STOPSHIP: Turn debugging off.
private static final boolean DEBUG = true;
- /**
- * Passed with {@link TvInputListener#onError(String, int)}. Indicates that the connection to
- * the requested TV input was not established thus the view is unable to handle the further
- * operations.
- */
- public static final int ERROR_INPUT_NOT_CONNECTED = 0;
-
- /**
- * Passed with {@link TvInputListener#onError(String, int)}. Indicates that the underlying TV
- * input has been disconnected.
- */
- public static final int ERROR_INPUT_DISCONNECTED = 1;
-
private static final int VIDEO_SIZE_VALUE_UNKNOWN = 0;
private static final int ZORDER_MEDIA = 0;
@@ -116,8 +103,10 @@
private final SurfaceHolder.Callback mSurfaceHolderCallback = new SurfaceHolder.Callback() {
@Override
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
- Log.d(TAG, "surfaceChanged(holder=" + holder + ", format=" + format + ", width=" + width
- + ", height=" + height + ")");
+ if (DEBUG) {
+ Log.d(TAG, "surfaceChanged(holder=" + holder + ", format=" + format + ", width="
+ + width + ", height=" + height + ")");
+ }
mSurfaceFormat = format;
mSurfaceWidth = width;
mSurfaceHeight = height;
@@ -188,24 +177,27 @@
}
/**
- * Sets this as main TvView.
+ * Sets this as the main {@link TvView}.
* <p>
- * Main TvView is the TvView which user is watching and interacting mainly. It is used for
- * determining internal behavior of hardware TV input devices. For example, this influences
- * how HDMI-CEC active source will be managed.
+ * The main {@link TvView} is a {@link TvView} whose corresponding TV input determines the
+ * HDMI-CEC active source device. For an HDMI port input, one of source devices that is
+ * connected to that HDMI port becomes the active source. For an HDMI-CEC logical device input,
+ * the corresponding HDMI-CEC logical device becomes the active source. For any non-HDMI input
+ * (including the tuner, composite, S-Video, etc.), the internal device (= TV itself) becomes
+ * the active source.
* </p><p>
- * First tuned TvView becomes main automatically, and keeps to be main until setMainTvView() is
- * called for other TvView. Note that main TvView won't be reset even when current main TvView
- * is removed from view hierarchy.
+ * First tuned {@link TvView} becomes main automatically, and keeps to be main until {@link
+ * #setMain} is called for other {@link TvView}. Note that main {@link TvView} won't be reset
+ * even when current main {@link TvView} is removed from view hierarchy.
* </p>
* @hide
*/
@SystemApi
- public void setMainTvView() {
+ public void setMain() {
synchronized (sMainTvViewLock) {
sMainTvView = this;
if (hasWindowFocus() && mSession != null) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
}
@@ -327,6 +319,7 @@
* This method is primarily used to un-tune the current TvView.
*/
public void reset() {
+ if (DEBUG) Log.d(TAG, "reset()");
if (mSession != null) {
release();
resetSurfaceView();
@@ -538,7 +531,7 @@
// Set main again to regain main session.
synchronized (sMainTvViewLock) {
if (hasFocus && this == sMainTvView && mSession != null) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
}
@@ -596,6 +589,7 @@
mSurfaceView.getHolder().removeCallback(mSurfaceHolderCallback);
removeView(mSurfaceView);
}
+ mSurface = null;
mSurfaceView = new SurfaceView(getContext(), mAttrs, mDefStyleAttr) {
@Override
protected void updateWindow(boolean force, boolean redrawNeeded) {
@@ -679,13 +673,20 @@
public abstract static class TvInputListener {
/**
- * This is invoked when an error occurred while handling requested operation.
+ * This is invoked when an error occurred while establishing a connection to the underlying
+ * TV input.
*
* @param inputId The ID of the TV input bound to this view.
- * @param errorCode The error code. For the details of error code, please see
- * {@link TvView}.
*/
- public void onError(String inputId, int errorCode) {
+ public void onConnectionFailed(String inputId) {
+ }
+
+ /**
+ * This is invoked when the existing connection to the underlying TV input is lost.
+ *
+ * @param inputId The ID of the TV input bound to this view.
+ */
+ public void onDisconnected(String inputId) {
}
/**
@@ -821,11 +822,14 @@
}
return;
}
+ if (DEBUG) {
+ Log.d(TAG, "onSessionCreated()");
+ }
mSession = session;
if (session != null) {
synchronized (sMainTvViewLock) {
if (hasWindowFocus() && TvView.this == sMainTvView) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
// mSurface may not be ready yet as soon as starting an application.
@@ -847,7 +851,7 @@
}
} else {
if (mListener != null) {
- mListener.onError(mInputId, ERROR_INPUT_NOT_CONNECTED);
+ mListener.onConnectionFailed(mInputId);
}
}
}
@@ -860,7 +864,7 @@
mSessionCallback = null;
mSession = null;
if (mListener != null) {
- mListener.onError(mInputId, ERROR_INPUT_DISCONNECTED);
+ mListener.onDisconnected(mInputId);
}
}
diff --git a/media/jni/android_media_MediaCodecList.cpp b/media/jni/android_media_MediaCodecList.cpp
index ecba02a..12eb7d2 100644
--- a/media/jni/android_media_MediaCodecList.cpp
+++ b/media/jni/android_media_MediaCodecList.cpp
@@ -85,6 +85,7 @@
sp<IMediaCodecList> mcl = getCodecList(env);
if (mcl == NULL) {
// Runtime exception already pending.
+ env->ReleaseStringUTFChars(name, nameStr);
return -ENOENT;
}
@@ -162,7 +163,6 @@
}
const char *typeStr = env->GetStringUTFChars(type, NULL);
-
if (typeStr == NULL) {
// Out of memory exception already pending.
return NULL;
@@ -177,12 +177,12 @@
// TODO query default-format also from codec/codec list
const sp<MediaCodecInfo::Capabilities> &capabilities =
info->getCapabilitiesFor(typeStr);
+ env->ReleaseStringUTFChars(type, typeStr);
+ typeStr = NULL;
if (capabilities == NULL) {
jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
return NULL;
}
- env->ReleaseStringUTFChars(type, typeStr);
- typeStr = NULL;
capabilities->getSupportedColorFormats(&colorFormats);
capabilities->getSupportedProfileLevels(&profileLevels);
diff --git a/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml b/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
index 15218de..06a135c 100644
--- a/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
@@ -16,20 +16,20 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="backup_confirm_title" msgid="827563724209303345">"အရံ သိမ်းဆည်းမှု အပြည့်လုပ်ရန်"</string>
+ <string name="backup_confirm_title" msgid="827563724209303345">"အရံ သိမ်းဆည်းမှု အပြည့်လုပ်ရန်"</string>
<string name="restore_confirm_title" msgid="5469365809567486602">"အားလုံးပြန်လည်ရယူရန်"</string>
- <string name="backup_confirm_text" msgid="1878021282758896593">"ချိတ်ဆက်ထားသောကွန်ပြုတာသို့ ဒေတာအားလုံးအား အရန်သိမ်းဆည်းရန် တောင်းခံပါသည်။ သင်ခွင့်ပြုမည်လား။ \n\nအကယ်၍ သင်သည်အရန်သိမ်းဆည်းရန် မတောင်းခံခဲ့ပါက ဤဆောင်ရွက်ချက်အား ရှေ့ဆက်ရန်ခွင့်မပြုပါနှင့်။"</string>
+ <string name="backup_confirm_text" msgid="1878021282758896593">"ချိတ်ဆက်ထားသောကွန်ပြုတာသို့ ဒေတာအားလုံးအား အရန်သိမ်းဆည်းရန် တောင်းခံပါသည်။ သင်ခွင့်ပြုမည်လား။ \n\nအကယ်၍ သင်သည်အရန်သိမ်းဆည်းရန် မတောင်းခံခဲ့ပါက ဤဆောင်ရွက်ချက်အား ရှေ့ဆက်ရန်ခွင့်မပြုပါနှင့်။"</string>
<string name="allow_backup_button_label" msgid="4217228747769644068">"ကျွန်ုပ်၏ဒေတာများကို အရန်ထားခြင်း"</string>
- <string name="deny_backup_button_label" msgid="6009119115581097708">"အရံသိမ်းဆည်းမှု မလုပ်ပါနှင့်"</string>
- <string name="restore_confirm_text" msgid="7499866728030461776">"ချိတ်ဆက်ထားသောကွန်ပြုတာသို့ ဒေတာအားလုံးအား ပြန်လည်ရယူရန် တောင်းခံပါသည်။ သင်ခွင့်ပြုမည်လား။ \n\nအကယ်၍ သင်သည် ပြန်လည်ရယူရန် ဤဆောင်ရွက်ချက်အား ရှေ့ဆက်ရန်ခွင့်မပြုပါနှင့်။ လက်ရှိစက်ထဲ၌ရှိသောဒေတာအား အစားထိုးမည်ဖြစ်သည်။"</string>
+ <string name="deny_backup_button_label" msgid="6009119115581097708">"အရံသိမ်းဆည်းမှု မလုပ်ပါနှင့်"</string>
+ <string name="restore_confirm_text" msgid="7499866728030461776">"ချိတ်ဆက်ထားသောကွန်ပြုတာသို့ ဒေတာအားလုံးအား ပြန်လည်ရယူရန် တောင်းခံပါသည်။ သင်ခွင့်ပြုမည်လား။ \n\nအကယ်၍ သင်သည် ပြန်လည်ရယူရန် ဤဆောင်ရွက်ချက်အား ရှေ့ဆက်ရန်ခွင့်မပြုပါနှင့်။ လက်ရှိစက်ထဲ၌ရှိသောဒေတာအား အစားထိုးမည်ဖြစ်သည်။"</string>
<string name="allow_restore_button_label" msgid="3081286752277127827">"ကျွန်ုပ်၏ဒေတာများကို ပြန်လည်ရယူရန်"</string>
- <string name="deny_restore_button_label" msgid="1724367334453104378">"ပြန်လည်ရယူခြင်းအား မပြုလုပ်ပါနှင့်"</string>
- <string name="current_password_text" msgid="8268189555578298067">"သင့်လက်ရှိ အရံသိမ်းဆည်းမှု လျှို့ဝှက်စကားဝှက်အား ထည့်သွင်းပါ။"</string>
- <string name="device_encryption_restore_text" msgid="1570864916855208992">"သင့်စက်၏ လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက်စကားဝှက်ကို ထည့်သွင်းပါ။"</string>
- <string name="device_encryption_backup_text" msgid="5866590762672844664">"သင့်စက်၏လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်စကားဝှက်အားထည့်ပါ။ အရံသိမ်းဆည်းမှု သိမ်းဆည်းနေရာတွင်လည်း အသုံးပြုမည်ဖြစ်သည်။"</string>
- <string name="backup_enc_password_text" msgid="4981585714795233099">"ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းပြီးလျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။ အကယ်၍ ကွက်လပ်ထားပါက ယခုသင့်လက်ရှိလျှို့ဝှက်စကားဝှက်အား အသုံးပြုပါမည်။"</string>
- <string name="backup_enc_password_optional" msgid="1350137345907579306">"အကယ်၍ ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းကို ဝှက်လိုပါက အောက်တွင်လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။"</string>
- <string name="restore_enc_password_text" msgid="6140898525580710823">"အကယ်၍ ပြန်လည်ရယူမည့်ဒေတာမှာလျှို့ဝှက်အသွင်ပြောင်းထားပါက အောက်တွင်စကားဝှက်ကိုထည့်ပါ-"</string>
+ <string name="deny_restore_button_label" msgid="1724367334453104378">"ပြန်လည်ရယူခြင်းအား မပြုလုပ်ပါနှင့်"</string>
+ <string name="current_password_text" msgid="8268189555578298067">"သင့်လက်ရှိ အရံသိမ်းဆည်းမှု လျှို့ဝှက်စကားဝှက်အား ထည့်သွင်းပါ။"</string>
+ <string name="device_encryption_restore_text" msgid="1570864916855208992">"သင့်စက်၏ လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက်စကားဝှက်ကို ထည့်သွင်းပါ။"</string>
+ <string name="device_encryption_backup_text" msgid="5866590762672844664">"သင့်စက်၏လျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်စကားဝှက်အားထည့်ပါ။ အရံသိမ်းဆည်းမှု သိမ်းဆည်းနေရာတွင်လည်း အသုံးပြုမည်ဖြစ်သည်။"</string>
+ <string name="backup_enc_password_text" msgid="4981585714795233099">"ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းပြီးလျှို့ဝှက်အသွင်ပြောင်းခြင်းအတွက် လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။ အကယ်၍ ကွက်လပ်ထားပါက ယခုသင့်လက်ရှိလျှို့ဝှက်စကားဝှက်အား အသုံးပြုပါမည်။"</string>
+ <string name="backup_enc_password_optional" msgid="1350137345907579306">"အကယ်၍ ဒေတာအားလုံးအားအရန်သိမ်းဆည်းခြင်းကို ဝှက်လိုပါက အောက်တွင်လျှို့ဝှက်နံပါတ်/စာကိုထည့်ပါ။"</string>
+ <string name="restore_enc_password_text" msgid="6140898525580710823">"အကယ်၍ ပြန်လည်ရယူမည့်ဒေတာမှာလျှို့ဝှက်အသွင်ပြောင်းထားပါက အောက်တွင်စကားဝှက်ကိုထည့်ပါ-"</string>
<string name="toast_backup_started" msgid="550354281452756121">"Backupစတင်ပြုလုပ်နေသည်"</string>
<string name="toast_backup_ended" msgid="3818080769548726424">"Backupလုပ်ခြင်းပြီးဆုံးပါပြီ"</string>
<string name="toast_restore_started" msgid="7881679218971277385">"ပြန်လည်ရယူခြင်း စတင်ပြုလုပ်နေသည်"</string>
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index 20a621b..fae30e5 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -16,11 +16,13 @@
package com.android.defcontainer;
+import static android.net.TrafficStats.MB_IN_BYTES;
+
import android.app.IntentService;
+import android.content.Context;
import android.content.Intent;
import android.content.pm.IPackageManager;
import android.content.pm.PackageCleanItem;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageInfoLite;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
@@ -28,7 +30,6 @@
import android.content.pm.PackageParser.PackageParserException;
import android.content.res.ObbInfo;
import android.content.res.ObbScanner;
-import android.os.Build;
import android.os.Environment;
import android.os.Environment.UserEnvironment;
import android.os.FileUtils;
@@ -37,8 +38,6 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.os.StatFs;
-import android.provider.Settings;
import android.system.ErrnoException;
import android.system.Os;
import android.system.StructStatVfs;
@@ -50,13 +49,11 @@
import com.android.internal.os.IParcelFileDescriptorFactory;
import com.android.internal.util.ArrayUtils;
-import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
import libcore.io.Streams;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -69,7 +66,6 @@
*/
public class DefaultContainerService extends IntentService {
private static final String TAG = "DefContainer";
- private static final boolean localLOGV = false;
private static final String LIB_DIR_NAME = "lib";
@@ -114,7 +110,7 @@
return copyPackageToContainerInner(pkg, handle, containerId, key, isExternal,
isForwardLocked, abiOverride);
} catch (PackageParserException | IOException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
+ Slog.w(TAG, "Failed to copy package at " + packagePath, e);
return null;
} finally {
IoUtils.closeQuietly(handle);
@@ -155,10 +151,12 @@
* containing one or more APKs.
*/
@Override
- public PackageInfoLite getMinimalPackageInfo(final String packagePath, int flags,
- long threshold, String abiOverride) {
- PackageInfoLite ret = new PackageInfoLite();
+ public PackageInfoLite getMinimalPackageInfo(String packagePath, int flags,
+ String abiOverride) {
+ final Context context = DefaultContainerService.this;
+ final boolean isForwardLocked = (flags & PackageManager.INSTALL_FORWARD_LOCK) != 0;
+ PackageInfoLite ret = new PackageInfoLite();
if (packagePath == null) {
Slog.i(TAG, "Invalid package file " + packagePath);
ret.recommendedInstallLocation = PackageHelper.RECOMMEND_FAILED_INVALID_APK;
@@ -167,10 +165,12 @@
final File packageFile = new File(packagePath);
final PackageParser.PackageLite pkg;
+ final long sizeBytes;
try {
pkg = PackageParser.parsePackageLite(packageFile, 0);
- } catch (PackageParserException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
+ sizeBytes = calculateInstalledSizeInner(pkg, isForwardLocked, abiOverride);
+ } catch (PackageParserException | IOException e) {
+ Slog.w(TAG, "Failed to parse package at " + packagePath + ": " + e);
if (!packageFile.exists()) {
ret.recommendedInstallLocation = PackageHelper.RECOMMEND_FAILED_INVALID_URI;
@@ -185,55 +185,13 @@
ret.versionCode = pkg.versionCode;
ret.installLocation = pkg.installLocation;
ret.verifiers = pkg.verifiers;
- ret.recommendedInstallLocation = recommendAppInstallLocation(pkg, flags, threshold,
- abiOverride);
+ ret.recommendedInstallLocation = PackageHelper.resolveInstallLocation(context,
+ pkg.packageName, pkg.installLocation, sizeBytes, flags);
ret.multiArch = pkg.multiArch;
return ret;
}
- /**
- * Determine if package will fit on internal storage.
- *
- * @param packagePath absolute path to the package to be copied. Can be
- * a single monolithic APK file or a cluster directory
- * containing one or more APKs.
- */
- @Override
- public boolean checkInternalFreeStorage(String packagePath, boolean isForwardLocked,
- long threshold) throws RemoteException {
- final File packageFile = new File(packagePath);
- final PackageParser.PackageLite pkg;
- try {
- pkg = PackageParser.parsePackageLite(packageFile, 0);
- return isUnderInternalThreshold(pkg, isForwardLocked, threshold);
- } catch (PackageParserException | IOException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
- return false;
- }
- }
-
- /**
- * Determine if package will fit on external storage.
- *
- * @param packagePath absolute path to the package to be copied. Can be
- * a single monolithic APK file or a cluster directory
- * containing one or more APKs.
- */
- @Override
- public boolean checkExternalFreeStorage(String packagePath, boolean isForwardLocked,
- String abiOverride) throws RemoteException {
- final File packageFile = new File(packagePath);
- final PackageParser.PackageLite pkg;
- try {
- pkg = PackageParser.parsePackageLite(packageFile, 0);
- return isUnderExternalThreshold(pkg, isForwardLocked, abiOverride);
- } catch (PackageParserException | IOException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
- return false;
- }
- }
-
@Override
public ObbInfo getObbInfo(String filename) {
try {
@@ -295,13 +253,10 @@
final PackageParser.PackageLite pkg;
try {
pkg = PackageParser.parsePackageLite(packageFile, 0);
- return calculateContainerSize(pkg, isForwardLocked, abiOverride) * 1024 * 1024;
+ return calculateInstalledSizeInner(pkg, isForwardLocked, abiOverride);
} catch (PackageParserException | IOException e) {
- /*
- * Okay, something failed, so let's just estimate it to be 2x
- * the file size. Note this will be 0 if the file doesn't exist.
- */
- return packageFile.length() * 2;
+ Slog.w(TAG, "Failed to calculate installed size: " + e);
+ return Long.MAX_VALUE;
}
}
};
@@ -356,159 +311,73 @@
private String copyPackageToContainerInner(PackageLite pkg, NativeLibraryHelper.Handle handle,
String newCid, String key, boolean isExternal, boolean isForwardLocked,
- String abiOverride) {
- // TODO: extend to support copying all split APKs
- if (!ArrayUtils.isEmpty(pkg.splitNames)) {
- throw new UnsupportedOperationException("Copying split APKs not yet supported");
- }
+ String abiOverride) throws IOException {
- final String resFileName = "pkg.apk";
- final String publicResFileName = "res.zip";
-
- if (pkg.multiArch) {
- // TODO: Support multiArch installs on ASEC.
- throw new IllegalArgumentException("multiArch not supported on ASEC installs.");
- }
-
- // The .apk file
- final String codePath = pkg.baseCodePath;
- final File codeFile = new File(codePath);
- final String[] abis;
- try {
- abis = calculateAbiList(handle, abiOverride, pkg.multiArch);
- } catch (IOException ioe) {
- Slog.w(TAG, "Problem determining app ABIS: " + ioe);
- return null;
- }
-
- // Calculate size of container needed to hold base APK.
- final int sizeMb;
- try {
- sizeMb = calculateContainerSize(pkg, handle, isForwardLocked, abis);
- } catch (IOException e) {
- Slog.w(TAG, "Problem when trying to copy " + codeFile.getPath());
- return null;
- }
+ // Calculate container size, rounding up to nearest MB and adding an
+ // extra MB for filesystem overhead
+ final long sizeBytes = calculateInstalledSizeInner(pkg, handle, isForwardLocked,
+ abiOverride);
+ final int sizeMb = ((int) ((sizeBytes + MB_IN_BYTES) / MB_IN_BYTES)) + 1;
// Create new container
- final String newCachePath = PackageHelper.createSdDir(sizeMb, newCid, key, Process.myUid(),
+ final String newMountPath = PackageHelper.createSdDir(sizeMb, newCid, key, Process.myUid(),
isExternal);
- if (newCachePath == null) {
- Slog.e(TAG, "Failed to create container " + newCid);
- return null;
+ if (newMountPath == null) {
+ throw new IOException("Failed to create container " + newCid);
}
-
- if (localLOGV) {
- Slog.i(TAG, "Created container for " + newCid + " at path : " + newCachePath);
- }
-
- final File resFile = new File(newCachePath, resFileName);
- if (FileUtils.copyFile(new File(codePath), resFile)) {
- if (localLOGV) {
- Slog.i(TAG, "Copied " + codePath + " to " + resFile);
- }
- } else {
- Slog.e(TAG, "Failed to copy " + codePath + " to " + resFile);
- // Clean up container
- PackageHelper.destroySdDir(newCid);
- return null;
- }
+ final File targetDir = new File(newMountPath);
try {
- Os.chmod(resFile.getAbsolutePath(), 0640);
+ // Copy all APKs
+ copyFile(pkg.baseCodePath, targetDir, "base.apk", isForwardLocked);
+ if (!ArrayUtils.isEmpty(pkg.splitNames)) {
+ for (int i = 0; i < pkg.splitNames.length; i++) {
+ copyFile(pkg.splitCodePaths[i], targetDir,
+ "split_" + pkg.splitNames[i] + ".apk", isForwardLocked);
+ }
+ }
+
+ // Extract native code
+ final File libraryRoot = new File(targetDir, LIB_DIR_NAME);
+ final int res = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle, libraryRoot,
+ abiOverride, pkg.multiArch);
+ if (res != PackageManager.INSTALL_SUCCEEDED) {
+ throw new IOException("Failed to extract native code, res=" + res);
+ }
+
+ if (!PackageHelper.finalizeSdDir(newCid)) {
+ throw new IOException("Failed to finalize " + newCid);
+ }
+
+ if (PackageHelper.isContainerMounted(newCid)) {
+ PackageHelper.unMountSdDir(newCid);
+ }
+
} catch (ErrnoException e) {
- Slog.e(TAG, "Could not chown APK: " + e.getMessage());
PackageHelper.destroySdDir(newCid);
- return null;
- }
-
- if (isForwardLocked) {
- File publicZipFile = new File(newCachePath, publicResFileName);
- try {
- PackageHelper.extractPublicFiles(resFile.getAbsolutePath(), publicZipFile);
- if (localLOGV) {
- Slog.i(TAG, "Copied resources to " + publicZipFile);
- }
- } catch (IOException e) {
- Slog.e(TAG, "Could not chown public APK " + publicZipFile.getAbsolutePath() + ": "
- + e.getMessage());
- PackageHelper.destroySdDir(newCid);
- return null;
- }
-
- try {
- Os.chmod(publicZipFile.getAbsolutePath(), 0644);
- } catch (ErrnoException e) {
- Slog.e(TAG, "Could not chown public resource file: " + e.getMessage());
- PackageHelper.destroySdDir(newCid);
- return null;
- }
- }
-
- final File sharedLibraryDir = new File(newCachePath, LIB_DIR_NAME);
- if (sharedLibraryDir.mkdir()) {
- int ret = PackageManager.INSTALL_SUCCEEDED;
- if (abis != null) {
- // TODO(multiArch): Support multi-arch installs on asecs. Note that we are NOT
- // using an ISA specific subdir here for now.
- final String abi = abis[0];
- ret = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle,
- sharedLibraryDir, abi);
-
- if (ret != PackageManager.INSTALL_SUCCEEDED) {
- Slog.e(TAG, "Could not copy native libraries to " + sharedLibraryDir.getPath());
- PackageHelper.destroySdDir(newCid);
- return null;
- }
- }
- } else {
- Slog.e(TAG, "Could not create native lib directory: " + sharedLibraryDir.getPath());
+ throw e.rethrowAsIOException();
+ } catch (IOException e) {
PackageHelper.destroySdDir(newCid);
- return null;
+ throw e;
}
- if (!PackageHelper.finalizeSdDir(newCid)) {
- Slog.e(TAG, "Failed to finalize " + newCid + " at path " + newCachePath);
- // Clean up container
- PackageHelper.destroySdDir(newCid);
- return null;
- }
-
- if (localLOGV) {
- Slog.i(TAG, "Finalized container " + newCid);
- }
-
- if (PackageHelper.isContainerMounted(newCid)) {
- if (localLOGV) {
- Slog.i(TAG, "Unmounting " + newCid + " at path " + newCachePath);
- }
-
- // Force a gc to avoid being killed.
- Runtime.getRuntime().gc();
- PackageHelper.unMountSdDir(newCid);
- } else {
- if (localLOGV) {
- Slog.i(TAG, "Container " + newCid + " not mounted");
- }
- }
-
- return newCachePath;
+ return newMountPath;
}
private int copyPackageInner(PackageLite pkg, IParcelFileDescriptorFactory target)
throws IOException, RemoteException {
- copyFile(pkg.baseCodePath, "base.apk", target);
+ copyFile(pkg.baseCodePath, target, "base.apk");
if (!ArrayUtils.isEmpty(pkg.splitNames)) {
for (int i = 0; i < pkg.splitNames.length; i++) {
- copyFile(pkg.splitCodePaths[i], "split_" + pkg.splitNames[i] + ".apk", target);
+ copyFile(pkg.splitCodePaths[i], target, "split_" + pkg.splitNames[i] + ".apk");
}
}
return PackageManager.INSTALL_SUCCEEDED;
}
- private void copyFile(String sourcePath, String targetName,
- IParcelFileDescriptorFactory target) throws IOException, RemoteException {
+ private void copyFile(String sourcePath, IParcelFileDescriptorFactory target, String targetName)
+ throws IOException, RemoteException {
Slog.d(TAG, "Copying " + sourcePath + " to " + targetName);
InputStream in = null;
OutputStream out = null;
@@ -523,251 +392,58 @@
}
}
- private static final int PREFER_INTERNAL = 1;
- private static final int PREFER_EXTERNAL = 2;
+ private void copyFile(String sourcePath, File targetDir, String targetName,
+ boolean isForwardLocked) throws IOException, ErrnoException {
+ final File sourceFile = new File(sourcePath);
+ final File targetFile = new File(targetDir, targetName);
- private int recommendAppInstallLocation(PackageLite pkg, int flags, long threshold,
- String abiOverride) {
- int prefer;
- boolean checkBoth = false;
-
- final boolean isForwardLocked = (flags & PackageManager.INSTALL_FORWARD_LOCK) != 0;
-
- check_inner : {
- /*
- * Explicit install flags should override the manifest settings.
- */
- if ((flags & PackageManager.INSTALL_INTERNAL) != 0) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if ((flags & PackageManager.INSTALL_EXTERNAL) != 0) {
- prefer = PREFER_EXTERNAL;
- break check_inner;
- }
-
- /* No install flags. Check for manifest option. */
- if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
- prefer = PREFER_EXTERNAL;
- checkBoth = true;
- break check_inner;
- } else if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
- // We default to preferring internal storage.
- prefer = PREFER_INTERNAL;
- checkBoth = true;
- break check_inner;
- }
-
- // Pick user preference
- int installPreference = Settings.Global.getInt(getApplicationContext()
- .getContentResolver(),
- Settings.Global.DEFAULT_INSTALL_LOCATION,
- PackageHelper.APP_INSTALL_AUTO);
- if (installPreference == PackageHelper.APP_INSTALL_INTERNAL) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if (installPreference == PackageHelper.APP_INSTALL_EXTERNAL) {
- prefer = PREFER_EXTERNAL;
- break check_inner;
- }
-
- /*
- * Fall back to default policy of internal-only if nothing else is
- * specified.
- */
- prefer = PREFER_INTERNAL;
+ Slog.d(TAG, "Copying " + sourceFile + " to " + targetFile);
+ if (!FileUtils.copyFile(sourceFile, targetFile)) {
+ throw new IOException("Failed to copy " + sourceFile + " to " + targetFile);
}
- final boolean emulated = Environment.isExternalStorageEmulated();
+ if (isForwardLocked) {
+ final String publicTargetName = PackageHelper.replaceEnd(targetName,
+ ".apk", ".zip");
+ final File publicTargetFile = new File(targetDir, publicTargetName);
- boolean fitsOnInternal = false;
- if (checkBoth || prefer == PREFER_INTERNAL) {
- try {
- fitsOnInternal = isUnderInternalThreshold(pkg, isForwardLocked, threshold);
- } catch (IOException e) {
- return PackageHelper.RECOMMEND_FAILED_INVALID_URI;
- }
- }
+ PackageHelper.extractPublicFiles(sourceFile, publicTargetFile);
- boolean fitsOnSd = false;
- if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL)) {
- try {
- fitsOnSd = isUnderExternalThreshold(pkg, isForwardLocked, abiOverride);
- } catch (IOException e) {
- return PackageHelper.RECOMMEND_FAILED_INVALID_URI;
- }
- }
-
- if (prefer == PREFER_INTERNAL) {
- if (fitsOnInternal) {
- return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
- }
- } else if (!emulated && prefer == PREFER_EXTERNAL) {
- if (fitsOnSd) {
- return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
- }
- }
-
- if (checkBoth) {
- if (fitsOnInternal) {
- return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
- } else if (!emulated && fitsOnSd) {
- return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
- }
- }
-
- /*
- * If they requested to be on the external media by default, return that
- * the media was unavailable. Otherwise, indicate there was insufficient
- * storage space available.
- */
- if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL)
- && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;
+ Os.chmod(targetFile.getAbsolutePath(), 0640);
+ Os.chmod(publicTargetFile.getAbsolutePath(), 0644);
} else {
- return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;
+ Os.chmod(targetFile.getAbsolutePath(), 0644);
}
}
- /**
- * Measure a file to see if it fits within the free space threshold.
- *
- * @param threshold byte threshold to compare against
- * @return true if file fits under threshold
- * @throws FileNotFoundException when APK does not exist
- */
- private boolean isUnderInternalThreshold(PackageLite pkg, boolean isForwardLocked,
- long threshold) throws IOException {
- long sizeBytes = 0;
- for (String codePath : pkg.getAllCodePaths()) {
- sizeBytes += new File(codePath).length();
-
- if (isForwardLocked) {
- sizeBytes += PackageHelper.extractPublicFiles(codePath, null);
- }
- }
-
- final StatFs stat = new StatFs(Environment.getDataDirectory().getPath());
- final long availBytes = stat.getAvailableBytes();
- return (availBytes - sizeBytes) > threshold;
- }
-
- /**
- * Measure a file to see if it fits in the external free space.
- *
- * @return true if file fits
- * @throws IOException when file does not exist
- */
- private boolean isUnderExternalThreshold(PackageLite pkg, boolean isForwardLocked,
+ private long calculateInstalledSizeInner(PackageLite pkg, boolean isForwardLocked,
String abiOverride) throws IOException {
- if (Environment.isExternalStorageEmulated()) {
- return false;
- }
-
- final int sizeMb = calculateContainerSize(pkg, isForwardLocked, abiOverride);
-
- final int availSdMb;
- if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- final StatFs sdStats = new StatFs(Environment.getExternalStorageDirectory().getPath());
- final int blocksToMb = (1 << 20) / sdStats.getBlockSize();
- availSdMb = sdStats.getAvailableBlocks() * blocksToMb;
- } else {
- availSdMb = -1;
- }
-
- return availSdMb > sizeMb;
- }
-
- private int calculateContainerSize(PackageLite pkg, boolean isForwardLocked, String abiOverride)
- throws IOException {
NativeLibraryHelper.Handle handle = null;
try {
handle = NativeLibraryHelper.Handle.create(pkg);
- return calculateContainerSize(pkg, handle, isForwardLocked,
- calculateAbiList(handle, abiOverride, pkg.multiArch));
+ return calculateInstalledSizeInner(pkg, handle, isForwardLocked, abiOverride);
} finally {
IoUtils.closeQuietly(handle);
}
}
- private String[] calculateAbiList(NativeLibraryHelper.Handle handle, String abiOverride,
- boolean isMultiArch) throws IOException {
- if (isMultiArch) {
- final int abi32 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_32_BIT_ABIS);
- final int abi64 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_64_BIT_ABIS);
-
- if (abi32 >= 0 && abi64 >= 0) {
- return new String[] { Build.SUPPORTED_64_BIT_ABIS[abi64], Build.SUPPORTED_32_BIT_ABIS[abi32] };
- } else if (abi64 >= 0) {
- return new String[] { Build.SUPPORTED_64_BIT_ABIS[abi64] };
- } else if (abi32 >= 0) {
- return new String[] { Build.SUPPORTED_32_BIT_ABIS[abi32] };
- }
-
- if (abi64 != PackageManager.NO_NATIVE_LIBRARIES || abi32 != PackageManager.NO_NATIVE_LIBRARIES) {
- throw new IOException("Error determining ABI list: errorCode=[" + abi32 + "," + abi64 + "]");
- }
-
- } else {
- String[] abiList = Build.SUPPORTED_ABIS;
- if (abiOverride != null) {
- abiList = new String[] { abiOverride };
- } else if (Build.SUPPORTED_64_BIT_ABIS.length > 0 &&
- NativeLibraryHelper.hasRenderscriptBitcode(handle)) {
- abiList = Build.SUPPORTED_32_BIT_ABIS;
- }
-
- final int abi = NativeLibraryHelper.findSupportedAbi(handle,abiList);
- if (abi >= 0) {
- return new String[]{Build.SUPPORTED_ABIS[abi]};
- }
-
- if (abi != PackageManager.NO_NATIVE_LIBRARIES) {
- throw new IOException("Error determining ABI list: errorCode=" + abi);
- }
- }
-
- return null;
- }
-
- /**
- * Calculate the container size for a package.
- *
- * @return size in megabytes (2^20 bytes)
- * @throws IOException when there is a problem reading the file
- */
- private int calculateContainerSize(PackageLite pkg, NativeLibraryHelper.Handle handle,
- boolean isForwardLocked, String[] abis) throws IOException {
- // Calculate size of container needed to hold APKs.
+ private long calculateInstalledSizeInner(PackageLite pkg, NativeLibraryHelper.Handle handle,
+ boolean isForwardLocked, String abiOverride) throws IOException {
long sizeBytes = 0;
+
+ // Include raw APKs, and possibly unpacked resources
for (String codePath : pkg.getAllCodePaths()) {
- sizeBytes += new File(codePath).length();
+ final File codeFile = new File(codePath);
+ sizeBytes += codeFile.length();
if (isForwardLocked) {
- sizeBytes += PackageHelper.extractPublicFiles(codePath, null);
+ sizeBytes += PackageHelper.extractPublicFiles(codeFile, null);
}
}
- // Check all the native files that need to be copied and add that to the
- // container size.
- if (abis != null) {
- sizeBytes += NativeLibraryHelper.sumNativeBinariesLI(handle, abis);
- }
+ // Include all relevant native code
+ sizeBytes += NativeLibraryHelper.sumNativeBinaries(handle, abiOverride, pkg.multiArch);
- int sizeMb = (int) (sizeBytes >> 20);
- if ((sizeBytes - (sizeMb * 1024 * 1024)) > 0) {
- sizeMb++;
- }
-
- /*
- * Add buffer size because we don't have a good way to determine the
- * real FAT size. Your FAT size varies with how many directory entries
- * you need, how big the whole filesystem is, and other such headaches.
- */
- sizeMb++;
-
- return sizeMb;
+ return sizeBytes;
}
}
diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml
index 6f4f24a..19fe7a7 100644
--- a/packages/DocumentsUI/res/values-af/strings.xml
+++ b/packages/DocumentsUI/res/values-af/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Deel"</string>
<string name="menu_delete" msgid="8138799623850614177">"Vee uit"</string>
<string name="menu_select" msgid="8711270657353563424">"Kies \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Wys lêergrootte"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Versteek lêergrootte"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> gekies"</string>
<string name="sort_name" msgid="9183560467917256779">"Volgens naam"</string>
<string name="sort_date" msgid="586080032956151448">"Volgens datum gewysig"</string>
diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml
index 8459a3c..419d162 100644
--- a/packages/DocumentsUI/res/values-am/strings.xml
+++ b/packages/DocumentsUI/res/values-am/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"አጋራ"</string>
<string name="menu_delete" msgid="8138799623850614177">"ሰርዝ"</string>
<string name="menu_select" msgid="8711270657353563424">"«<xliff:g id="DIRECTORY">^1</xliff:g>»ን ይምረጡ"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"የፋይል መጠን አሳይ"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"የፋይል መጠን ደብቅ"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ተመርጠዋል"</string>
<string name="sort_name" msgid="9183560467917256779">"በስም"</string>
<string name="sort_date" msgid="586080032956151448">"በተለወጠበት ቀን"</string>
diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml
index d699df4..77f6855 100644
--- a/packages/DocumentsUI/res/values-bg/strings.xml
+++ b/packages/DocumentsUI/res/values-bg/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Споделяне"</string>
<string name="menu_delete" msgid="8138799623850614177">"Изтриване"</string>
<string name="menu_select" msgid="8711270657353563424">"Избиране на „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Размер на файла: Показв."</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Размер на файла: Скрив."</string>
<string name="mode_selected_count" msgid="459111894725594625">"Избрахте <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"По име"</string>
<string name="sort_date" msgid="586080032956151448">"По дата на промяната"</string>
diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
index 4d4c962..603cb96 100644
--- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"ভাগ করুন"</string>
<string name="menu_delete" msgid="8138799623850614177">"মুছুন"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" নির্বাচন করুন"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ফাইলের আকার দেখান"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ফাইলের আকার লুকান"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> নির্বাচন করা হয়েছে"</string>
<string name="sort_name" msgid="9183560467917256779">"নামের দ্বারা"</string>
<string name="sort_date" msgid="586080032956151448">"পরিবর্তনের তারিখ দ্বারা"</string>
diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml
index caa4c09..d973650 100644
--- a/packages/DocumentsUI/res/values-ca/strings.xml
+++ b/packages/DocumentsUI/res/values-ca/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Comparteix"</string>
<string name="menu_delete" msgid="8138799623850614177">"Suprimeix"</string>
<string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Mostra la mida de fitxer"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Amaga la mida del fitxer"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Seleccionats: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Per nom"</string>
<string name="sort_date" msgid="586080032956151448">"Per data de modificació"</string>
diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml
index 1229c35..b08fdab 100644
--- a/packages/DocumentsUI/res/values-cs/strings.xml
+++ b/packages/DocumentsUI/res/values-cs/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Sdílet"</string>
<string name="menu_delete" msgid="8138799623850614177">"Smazat"</string>
<string name="menu_select" msgid="8711270657353563424">"Vyberte adresář <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Zobr. velikost souboru"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrýt velikost souboru"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Vybráno: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Podle názvu"</string>
<string name="sort_date" msgid="586080032956151448">"Podle data úpravy"</string>
diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml
index 032a3d4..5feb517 100644
--- a/packages/DocumentsUI/res/values-da/strings.xml
+++ b/packages/DocumentsUI/res/values-da/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Del"</string>
<string name="menu_delete" msgid="8138799623850614177">"Slet"</string>
<string name="menu_select" msgid="8711270657353563424">"Vælg \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Vis filstørrelse"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelse"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> er valgt"</string>
<string name="sort_name" msgid="9183560467917256779">"Efter navn"</string>
<string name="sort_date" msgid="586080032956151448">"Efter ændringsdato"</string>
diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml
index d00688b..598862b 100644
--- a/packages/DocumentsUI/res/values-de/strings.xml
+++ b/packages/DocumentsUI/res/values-de/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Teilen"</string>
<string name="menu_delete" msgid="8138799623850614177">"Löschen"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" auswählen"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Dateigröße anzeigen"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Dateigröße ausblenden"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ausgewählt"</string>
<string name="sort_name" msgid="9183560467917256779">"Nach Name"</string>
<string name="sort_date" msgid="586080032956151448">"Nach Änderungsdatum"</string>
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
index 7946e38..4a47b73 100644
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
<string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
<string name="menu_select" msgid="8711270657353563424">"Seleccionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> seleccionado(s)"</string>
<string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
<string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml
index a40c43b..95cc812 100644
--- a/packages/DocumentsUI/res/values-es/strings.xml
+++ b/packages/DocumentsUI/res/values-es/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
<string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
<string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Mostrar tamaño archivo"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño archivo"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Seleccionado: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
<string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml
index 153274a..c98f0b9 100644
--- a/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Jaga"</string>
<string name="menu_delete" msgid="8138799623850614177">"Kustuta"</string>
<string name="menu_select" msgid="8711270657353563424">"Kataloogi „<xliff:g id="DIRECTORY">^1</xliff:g>” valimine"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Kuva faili suurus"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Peida faili suurus"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> on valitud"</string>
<string name="sort_name" msgid="9183560467917256779">"Nime järgi"</string>
<string name="sort_date" msgid="586080032956151448">"Muutmiskuupäeva järgi"</string>
diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml
index 99e4c42..1fd7b1d 100644
--- a/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Partekatu"</string>
<string name="menu_delete" msgid="8138799623850614177">"Ezabatu"</string>
<string name="menu_select" msgid="8711270657353563424">"Hautatu \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Erakutsi fitxategi-tamaina"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Ezkutatu fitxategi-tamaina"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> hautatuta"</string>
<string name="sort_name" msgid="9183560467917256779">"Izenaren arabera"</string>
<string name="sort_date" msgid="586080032956151448">"Aldatze-dataren arabera"</string>
diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml
index 97c4a14..6c57211 100644
--- a/packages/DocumentsUI/res/values-fa/strings.xml
+++ b/packages/DocumentsUI/res/values-fa/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"اشتراکگذاری"</string>
<string name="menu_delete" msgid="8138799623850614177">"حذف"</string>
<string name="menu_select" msgid="8711270657353563424">"انتخاب «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"نمایش اندازه فایل"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"پنهان کردن اندازه فایل"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> انتخاب شد"</string>
<string name="sort_name" msgid="9183560467917256779">"بر اساس نام"</string>
<string name="sort_date" msgid="586080032956151448">"بر اساس تاریخ اصلاح"</string>
diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml
index a81d426..185be47 100644
--- a/packages/DocumentsUI/res/values-fi/strings.xml
+++ b/packages/DocumentsUI/res/values-fi/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Jaa"</string>
<string name="menu_delete" msgid="8138799623850614177">"Poista"</string>
<string name="menu_select" msgid="8711270657353563424">"Valitse <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Näytä tiedostokoko"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Piilota tiedostokoko"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valittua"</string>
<string name="sort_name" msgid="9183560467917256779">"Nimen mukaan"</string>
<string name="sort_date" msgid="586080032956151448">"Muokkauspäivän mukaan"</string>
diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
index f8ec314..4e4c0ed 100644
--- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Partager"</string>
<string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
<string name="menu_select" msgid="8711270657353563424">"Sélectionner « <xliff:g id="DIRECTORY">^1</xliff:g> »"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> sélectionné(s)"</string>
<string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
<string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml
index bff81d5..b760caa 100644
--- a/packages/DocumentsUI/res/values-fr/strings.xml
+++ b/packages/DocumentsUI/res/values-fr/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Partager"</string>
<string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
<string name="menu_select" msgid="8711270657353563424">"Sélectionner \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> élément(s) sélectionné(s)"</string>
<string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
<string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml
index 747b85a..bc6ee9e 100644
--- a/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
<string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
<string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> seleccionados"</string>
<string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
<string name="sort_date" msgid="586080032956151448">"Por data de modificación"</string>
diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml
index d708741..c4dc652 100644
--- a/packages/DocumentsUI/res/values-hi/strings.xml
+++ b/packages/DocumentsUI/res/values-hi/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"साझा करें"</string>
<string name="menu_delete" msgid="8138799623850614177">"हटाएं"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" चुनें"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"फ़ाइल आकार दिखाएं"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"फ़ाइल आकार छिपाएं"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> चयनित"</string>
<string name="sort_name" msgid="9183560467917256779">"नाम के अनुसार"</string>
<string name="sort_date" msgid="586080032956151448">"बदलाव के दिनांक के अनुसार"</string>
diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml
index 19131d6..60343d2 100644
--- a/packages/DocumentsUI/res/values-hr/strings.xml
+++ b/packages/DocumentsUI/res/values-hr/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Dijeli"</string>
<string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
<string name="menu_select" msgid="8711270657353563424">"Odaberi \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"Odabrano: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Po korisniku"</string>
<string name="sort_date" msgid="586080032956151448">"Po datumu izmjene"</string>
diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml
index 91cfb25..a9b5a7c 100644
--- a/packages/DocumentsUI/res/values-hu/strings.xml
+++ b/packages/DocumentsUI/res/values-hu/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Megosztás"</string>
<string name="menu_delete" msgid="8138799623850614177">"Törlés"</string>
<string name="menu_select" msgid="8711270657353563424">"A(z) „<xliff:g id="DIRECTORY">^1</xliff:g>” mappa kiválasztása"</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> kiválasztva"</string>
<string name="sort_name" msgid="9183560467917256779">"Név szerint"</string>
<string name="sort_date" msgid="586080032956151448">"Módosítás dátuma szerint"</string>
diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
index 0a0c65a..cabc956 100644
--- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Համօգտագործել"</string>
<string name="menu_delete" msgid="8138799623850614177">"Ջնջել"</string>
<string name="menu_select" msgid="8711270657353563424">"Ընտրել «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Ցույց տալ ֆայլի չափը"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Թաքցնել ֆայլի չափը"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ընտրված"</string>
<string name="sort_name" msgid="9183560467917256779">"Ըստ անվան"</string>
<string name="sort_date" msgid="586080032956151448">"Ըստ փոփոխման ամսաթվի"</string>
diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml
index 46c8b49..1514fc6 100644
--- a/packages/DocumentsUI/res/values-in/strings.xml
+++ b/packages/DocumentsUI/res/values-in/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Bagikan"</string>
<string name="menu_delete" msgid="8138799623850614177">"Hapus"</string>
<string name="menu_select" msgid="8711270657353563424">"Pilih \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Tampilkan ukuran file"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan ukuran file"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> dipilih"</string>
<string name="sort_name" msgid="9183560467917256779">"Menurut nama"</string>
<string name="sort_date" msgid="586080032956151448">"Menurut tanggal diubah"</string>
diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml
index f656e78..f324dad 100644
--- a/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Deila"</string>
<string name="menu_delete" msgid="8138799623850614177">"Eyða"</string>
<string name="menu_select" msgid="8711270657353563424">"Velja „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valin"</string>
<string name="sort_name" msgid="9183560467917256779">"Eftir heiti"</string>
<string name="sort_date" msgid="586080032956151448">"Eftir breytingadags."</string>
diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml
index 98fe838..a073c44 100644
--- a/packages/DocumentsUI/res/values-it/strings.xml
+++ b/packages/DocumentsUI/res/values-it/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Condividi"</string>
<string name="menu_delete" msgid="8138799623850614177">"Elimina"</string>
<string name="menu_select" msgid="8711270657353563424">"Seleziona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Mostra dimensioni file"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Nascondi dimensioni file"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selezionati"</string>
<string name="sort_name" msgid="9183560467917256779">"Per nome"</string>
<string name="sort_date" msgid="586080032956151448">"Per data di modifica"</string>
diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml
index 9a830ec..6ab2880 100644
--- a/packages/DocumentsUI/res/values-iw/strings.xml
+++ b/packages/DocumentsUI/res/values-iw/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"שתף"</string>
<string name="menu_delete" msgid="8138799623850614177">"מחק"</string>
<string name="menu_select" msgid="8711270657353563424">"בחר ב-\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"הצג גודל קובץ"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"הסתר גודל קובץ"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> נבחרו"</string>
<string name="sort_name" msgid="9183560467917256779">"לפי שם"</string>
<string name="sort_date" msgid="586080032956151448">"לפי תאריך שינוי"</string>
diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml
index e9be029..f57a21c 100644
--- a/packages/DocumentsUI/res/values-ja/strings.xml
+++ b/packages/DocumentsUI/res/values-ja/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"共有"</string>
<string name="menu_delete" msgid="8138799623850614177">"削除"</string>
<string name="menu_select" msgid="8711270657353563424">"「<xliff:g id="DIRECTORY">^1</xliff:g>」を選択"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ファイルサイズを表示"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ファイルサイズを非表示"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g>件選択済み"</string>
<string name="sort_name" msgid="9183560467917256779">"名前順"</string>
<string name="sort_date" msgid="586080032956151448">"更新日順"</string>
diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
index aa24ae7..b1e39b8 100644
--- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"გაზიარება"</string>
<string name="menu_delete" msgid="8138799623850614177">"წაშლა"</string>
<string name="menu_select" msgid="8711270657353563424">"„<xliff:g id="DIRECTORY">^1</xliff:g>“-ის არჩევა"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ფაილის ზომის ჩვენება"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ფაილის ზომის დამალვა"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> მონიშნული"</string>
<string name="sort_name" msgid="9183560467917256779">"სახელით"</string>
<string name="sort_date" msgid="586080032956151448">"ცვლილების თარიღით"</string>
diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
index 755b994..c7e207c 100644
--- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Бөлісу"</string>
<string name="menu_delete" msgid="8138799623850614177">"Жою"</string>
<string name="menu_select" msgid="8711270657353563424">"«<xliff:g id="DIRECTORY">^1</xliff:g>» таңдау"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Файл өлшемін көрсету"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлшемін жасыру"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> таңдалды"</string>
<string name="sort_name" msgid="9183560467917256779">"Атауы бойынша"</string>
<string name="sort_date" msgid="586080032956151448">"Өзгертілген мерзімі бойынша"</string>
diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml
index d9fd1fa..bc03c87 100644
--- a/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml
@@ -20,19 +20,19 @@
<string name="title_open" msgid="4353228937663917801">"បើកពី"</string>
<string name="title_save" msgid="2433679664882857999">"រក្សាទុកទៅ"</string>
<string name="menu_create_dir" msgid="5947289605844398389">"បង្កើតថត"</string>
- <string name="menu_grid" msgid="6878021334497835259">"ទិដ្ឋភាពក្រឡា"</string>
+ <string name="menu_grid" msgid="6878021334497835259">"ទិដ្ឋភាពក្រឡា"</string>
<string name="menu_list" msgid="7279285939892417279">"ទិដ្ឋភាពបញ្ជី"</string>
<string name="menu_sort" msgid="7677740407158414452">"តម្រៀបតាម"</string>
<string name="menu_search" msgid="3816712084502856974">"ស្វែងរក"</string>
<string name="menu_settings" msgid="6008033148948428823">"ការកំណត់"</string>
<string name="menu_open" msgid="432922957274920903">"បើក"</string>
<string name="menu_save" msgid="2394743337684426338">"រក្សាទុក"</string>
- <string name="menu_share" msgid="3075149983979628146">"ចែករំលែក"</string>
+ <string name="menu_share" msgid="3075149983979628146">"ចែករំលែក"</string>
<string name="menu_delete" msgid="8138799623850614177">"លុប"</string>
<string name="menu_select" msgid="8711270657353563424">"ជ្រើស \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"បង្ហាញការផ្ទុកខាងក្នុង"</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="nosdcard" msgid="4218809952721972589">"លាក់ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
<string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"លាក់កាតអេសឌី"</string>
<string name="menu_file_size_show" msgid="3240323619260823076">"បង្ហាញទំហំឯកសារ"</string>
<string name="menu_file_size_hide" msgid="8881975928502581042">"លាក់ទំហំឯកសារ"</string>
@@ -51,7 +51,7 @@
<string name="root_type_shortcut" msgid="3318760609471618093">"ផ្លូវកាត់"</string>
<string name="root_type_device" msgid="7121342474653483538">"ឧបករណ៍"</string>
<string name="root_type_apps" msgid="8838065367985945189">"កម្មវិធីច្រើនទៀត"</string>
- <string name="empty" msgid="7858882803708117596">"គ្មានធាតុ"</string>
+ <string name="empty" msgid="7858882803708117596">"គ្មានធាតុ"</string>
<string name="toast_no_application" msgid="1339885974067891667">"មិនអាចបើកឯកសារ"</string>
<string name="toast_failed_delete" msgid="2180678019407244069">"មិនអាចលុបឯកសារមួយចំនួន"</string>
<string name="share_via" msgid="8966594246261344259">"ចែករំលែកតាម"</string>
diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
index 9cdd566..508f0e5 100644
--- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"ಹಂಚು"</string>
<string name="menu_delete" msgid="8138799623850614177">"ಅಳಿಸು"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" ಆಯ್ಕೆಮಾಡಿ"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ತೋರಿಸು"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ಫೈಲ್ ಗಾತ್ರವನ್ನು ಮರೆಮಾಡಿ"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
<string name="sort_name" msgid="9183560467917256779">"ಹೆಸರಿನ ಪ್ರಕಾರ"</string>
<string name="sort_date" msgid="586080032956151448">"ಮಾರ್ಪಡಿಸಿರುವ ದಿನಾಂಕದ ಪ್ರಕಾರ"</string>
diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml
index 56239d2..d6f0cbd 100644
--- a/packages/DocumentsUI/res/values-ko/strings.xml
+++ b/packages/DocumentsUI/res/values-ko/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"공유"</string>
<string name="menu_delete" msgid="8138799623850614177">"삭제"</string>
<string name="menu_select" msgid="8711270657353563424">"\'<xliff:g id="DIRECTORY">^1</xliff:g>\' 선택"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"파일 크기 표시"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"파일 크기 숨기기"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g>개 선택됨"</string>
<string name="sort_name" msgid="9183560467917256779">"이름순"</string>
<string name="sort_date" msgid="586080032956151448">"수정된 날짜순"</string>
diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
index a139b0a..5513746e 100644
--- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Бөлүшүү"</string>
<string name="menu_delete" msgid="8138799623850614177">"Өчүрүү"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" тандоо"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Файл өлчөмүн көрсөтүү"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Файл өлчөмүн жашыруу"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> тандалды"</string>
<string name="sort_name" msgid="9183560467917256779">"Аты боюнча"</string>
<string name="sort_date" msgid="586080032956151448">"Өзгөртүлгөн күнү боюнча"</string>
diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
index 52bf8ef..8db69c7 100644
--- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"ແບ່ງປັນ"</string>
<string name="menu_delete" msgid="8138799623850614177">"ລຶບ"</string>
<string name="menu_select" msgid="8711270657353563424">"ເລືອກ \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ສະແດງຂະໜາດໄຟລ໌"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ເຊື່ອງຂະຫນາດໄຟລ໌"</string>
<string name="mode_selected_count" msgid="459111894725594625">"ເລືອກແລ້ວ <xliff:g id="COUNT">%1$d</xliff:g> ລາຍການ"</string>
<string name="sort_name" msgid="9183560467917256779">"ຕາມຊື່"</string>
<string name="sort_date" msgid="586080032956151448">"ຕາມວັນທີທີ່ແກ້ໄຂ"</string>
diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml
index 91ead2a..0cd5812 100644
--- a/packages/DocumentsUI/res/values-lv/strings.xml
+++ b/packages/DocumentsUI/res/values-lv/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Kopīgot"</string>
<string name="menu_delete" msgid="8138799623850614177">"Dzēst"</string>
<string name="menu_select" msgid="8711270657353563424">"Atlasīt “<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"Atlasīts: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Pēc nosaukuma"</string>
<string name="sort_date" msgid="586080032956151448">"Pēc pārveidošanas datuma"</string>
diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
index b6acac9..d909741 100644
--- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Сподели"</string>
<string name="menu_delete" msgid="8138799623850614177">"Избриши"</string>
<string name="menu_select" msgid="8711270657353563424">"Одберете „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Прикажи целосна големина"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Сокриј целосна големина"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Избрани се <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"По име"</string>
<string name="sort_date" msgid="586080032956151448">"Изменети по датум"</string>
diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
index f042439..24f4815 100644
--- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"പങ്കിടുക"</string>
<string name="menu_delete" msgid="8138799623850614177">"ഇല്ലാതാക്കുക"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" തിരഞ്ഞെടുക്കുക"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ഫയൽ വലുപ്പം കാണിക്കുക"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ഫയൽ വലുപ്പം മറയ്ക്കുക"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> തിരഞ്ഞെടുത്തു"</string>
<string name="sort_name" msgid="9183560467917256779">"പേര് പ്രകാരം"</string>
<string name="sort_date" msgid="586080032956151448">"പരിഷ്ക്കരിച്ച തീയതി പ്രകാരം"</string>
diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
index c0d4c59..b59ded5 100644
--- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"सामायिक करा"</string>
<string name="menu_delete" msgid="8138799623850614177">"हटवा"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" निवडा"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"फाईल आकार दर्शवा"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"फाईल आकार लपवा"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> निवडले"</string>
<string name="sort_name" msgid="9183560467917256779">"नावानुसार"</string>
<string name="sort_date" msgid="586080032956151448">"सुधारित केलेल्या तारखेनुसार"</string>
diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
index 11ef508..5330d92 100644
--- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Kongsi"</string>
<string name="menu_delete" msgid="8138799623850614177">"Padam"</string>
<string name="menu_select" msgid="8711270657353563424">"Pilih \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Papar saiz fail"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan saiz fail"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> dipilih"</string>
<string name="sort_name" msgid="9183560467917256779">"Mengikut nama"</string>
<string name="sort_date" msgid="586080032956151448">"Diubah suai mengikut tarikh"</string>
diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml
index c0903af..98b3a90 100644
--- a/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"မျှဝေခြင်း"</string>
<string name="menu_delete" msgid="8138799623850614177">"ဖျက်ပစ်ရန်"</string>
<string name="menu_select" msgid="8711270657353563424">"ရွေးရန်\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ဖိုင်အရွယ်အစား ပြပါ"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ဖိုင်အရွယ်အစား ဖျောက်ပါ"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ခရွေးချယ်ပြီး"</string>
<string name="sort_name" msgid="9183560467917256779">"အမည်ဖြင့်"</string>
<string name="sort_date" msgid="586080032956151448">"ပြင်ဆင်မှု ရက်စွဲဖြင့်"</string>
diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml
index 196a97c..beee44f 100644
--- a/packages/DocumentsUI/res/values-nb/strings.xml
+++ b/packages/DocumentsUI/res/values-nb/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Del"</string>
<string name="menu_delete" msgid="8138799623850614177">"Slett"</string>
<string name="menu_select" msgid="8711270657353563424">"Velg «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Vis filstørrelsen"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelsen"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valgt"</string>
<string name="sort_name" msgid="9183560467917256779">"Etter navn"</string>
<string name="sort_date" msgid="586080032956151448">"«Etter dato» endret"</string>
diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
index a8876bd..4251a7c 100644
--- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"साझेदारी गर्नुहोस्"</string>
<string name="menu_delete" msgid="8138799623850614177">"मेटाउनुहोस्"</string>
<string name="menu_select" msgid="8711270657353563424">"चयनगर्नुहोस् \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"फाइल आकार देखाउनुहोस्"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"फाइल आकार लुकाउनुहोस्"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> चयन गरियो"</string>
<string name="sort_name" msgid="9183560467917256779">"नाम अनुसार"</string>
<string name="sort_date" msgid="586080032956151448">"परिमार्जित मिति अनुसार"</string>
diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml
index 588fd53..1fc7dc1 100644
--- a/packages/DocumentsUI/res/values-nl/strings.xml
+++ b/packages/DocumentsUI/res/values-nl/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Delen"</string>
<string name="menu_delete" msgid="8138799623850614177">"Verwijderen"</string>
<string name="menu_select" msgid="8711270657353563424">"<xliff:g id="DIRECTORY">^1</xliff:g> selecteren"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Bestandsgrootte weergeven"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Bestandsgrootte verbergen"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> geselecteerd"</string>
<string name="sort_name" msgid="9183560467917256779">"Op naam"</string>
<string name="sort_date" msgid="586080032956151448">"Op aanpassingsdatum"</string>
diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml
index 8f0b723..5bb7f75 100644
--- a/packages/DocumentsUI/res/values-pl/strings.xml
+++ b/packages/DocumentsUI/res/values-pl/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Udostępnij"</string>
<string name="menu_delete" msgid="8138799623850614177">"Usuń"</string>
<string name="menu_select" msgid="8711270657353563424">"Zaznacz „<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Pokaż rozmiar pliku"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Ukryj rozmiar pliku"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Wybrano: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Według nazwy"</string>
<string name="sort_date" msgid="586080032956151448">"Według daty edycji"</string>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
index 1867c0d..e32dfc9 100644
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Partilhar"</string>
<string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
<string name="menu_select" msgid="8711270657353563424">"Selecionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selecionado(s)"</string>
<string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
<string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml
index 159c638..184fb53 100644
--- a/packages/DocumentsUI/res/values-pt/strings.xml
+++ b/packages/DocumentsUI/res/values-pt/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
<string name="menu_delete" msgid="8138799623850614177">"Excluir"</string>
<string name="menu_select" msgid="8711270657353563424">"Selecionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selecionados"</string>
<string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
<string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
index 62108da..c5de856 100644
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ b/packages/DocumentsUI/res/values-ro/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Distribuiți"</string>
<string name="menu_delete" msgid="8138799623850614177">"Ștergeți"</string>
<string name="menu_select" msgid="8711270657353563424">"Selectați „<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selectate"</string>
<string name="sort_name" msgid="9183560467917256779">"După nume"</string>
<string name="sort_date" msgid="586080032956151448">"După data modificării"</string>
diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml
index 7a7d01f..10de6f0 100644
--- a/packages/DocumentsUI/res/values-ru/strings.xml
+++ b/packages/DocumentsUI/res/values-ru/strings.xml
@@ -20,7 +20,7 @@
<string name="title_open" msgid="4353228937663917801">"Открыть"</string>
<string name="title_save" msgid="2433679664882857999">"Сохранить"</string>
<string name="menu_create_dir" msgid="5947289605844398389">"Новая папка"</string>
- <string name="menu_grid" msgid="6878021334497835259">"Таблица"</string>
+ <string name="menu_grid" msgid="6878021334497835259">"Сетка"</string>
<string name="menu_list" msgid="7279285939892417279">"Список"</string>
<string name="menu_sort" msgid="7677740407158414452">"Сортировать"</string>
<string name="menu_search" msgid="3816712084502856974">"Поиск"</string>
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Поделиться"</string>
<string name="menu_delete" msgid="8138799623850614177">"Удалить"</string>
<string name="menu_select" msgid="8711270657353563424">"Выбрать папку \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Показать размер файлов"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Скрыть размер файлов"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Выбрано: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"По названию"</string>
<string name="sort_date" msgid="586080032956151448">"По дате изменения"</string>
diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml
index 0017c01..26e2b1d 100644
--- a/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"බෙදාගන්න"</string>
<string name="menu_delete" msgid="8138799623850614177">"මකන්න"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" තෝරන්න"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ගොනු ප්රමණය පෙන්වන්න"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ගොනු ප්රමණය සඟවන්න"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ක් තෝරාගන්නා ලදි"</string>
<string name="sort_name" msgid="9183560467917256779">"නමින්"</string>
<string name="sort_date" msgid="586080032956151448">"වෙනස් කරන ලද දිනයෙන්"</string>
diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml
index 70aff36..facaf4a 100644
--- a/packages/DocumentsUI/res/values-sk/strings.xml
+++ b/packages/DocumentsUI/res/values-sk/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Zdieľať"</string>
<string name="menu_delete" msgid="8138799623850614177">"Odstrániť"</string>
<string name="menu_select" msgid="8711270657353563424">"Vyberte adresár <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
- <!-- 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) -->
- <skip />
+ <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Zobraziť interné úložisko"</string>
+ <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobraziť kartu SD"</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ť kartu SD"</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="mode_selected_count" msgid="459111894725594625">"Vybraté: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Podľa názvu"</string>
<string name="sort_date" msgid="586080032956151448">"Podľa dátumu zmeny"</string>
diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml
index d956960..865df8b 100644
--- a/packages/DocumentsUI/res/values-sl/strings.xml
+++ b/packages/DocumentsUI/res/values-sl/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string>
<string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
<string name="menu_select" msgid="8711270657353563424">"Izbira mape »<xliff:g id="DIRECTORY">^1</xliff:g>«"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Pokaži velikost datoteke"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrij velikost datoteke"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Št. izbranih: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Po imenu"</string>
<string name="sort_date" msgid="586080032956151448">"Po datumu spremembe"</string>
diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml
index 25fb8c4..fd20722 100644
--- a/packages/DocumentsUI/res/values-sr/strings.xml
+++ b/packages/DocumentsUI/res/values-sr/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Дели"</string>
<string name="menu_delete" msgid="8138799623850614177">"Избриши"</string>
<string name="menu_select" msgid="8711270657353563424">"Изабери „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Прикажи величину датотеке"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Сакриј величину датотеке"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Изабрано је <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Према имену"</string>
<string name="sort_date" msgid="586080032956151448">"Према датуму измене"</string>
diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml
index 75a4110..b46d97f 100644
--- a/packages/DocumentsUI/res/values-sw/strings.xml
+++ b/packages/DocumentsUI/res/values-sw/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Shiriki"</string>
<string name="menu_delete" msgid="8138799623850614177">"Futa"</string>
<string name="menu_select" msgid="8711270657353563424">"Chagua \" <xliff:g id="DIRECTORY">^1</xliff:g> \""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> zimechaguliwa"</string>
<string name="sort_name" msgid="9183560467917256779">"Kwa jina"</string>
<string name="sort_date" msgid="586080032956151448">"Kwa tarehe viliporekebishwa"</string>
diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
index 8e57a42..5b09b97 100644
--- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
@@ -24,24 +24,18 @@
<string name="menu_list" msgid="7279285939892417279">"பட்டியல்"</string>
<string name="menu_sort" msgid="7677740407158414452">"இதன்படி வரிசைப்படுத்து"</string>
<string name="menu_search" msgid="3816712084502856974">"தேடு"</string>
- <string name="menu_settings" msgid="6008033148948428823">"அமைப்புகள்"</string>
+ <string name="menu_settings" msgid="6008033148948428823">"அமைப்பு"</string>
<string name="menu_open" msgid="432922957274920903">"திற"</string>
<string name="menu_save" msgid="2394743337684426338">"சேமி"</string>
<string name="menu_share" msgid="3075149983979628146">"பகிர்"</string>
<string name="menu_delete" msgid="8138799623850614177">"நீக்கு"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" ஐத் தேர்ந்தெடு"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"கோப்பு அளவைக் காட்டு"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"கோப்பு அளவை மறை"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன"</string>
<string name="sort_name" msgid="9183560467917256779">"பெயரின்படி"</string>
<string name="sort_date" msgid="586080032956151448">"தேதியின்படி திருத்தப்பட்டது"</string>
diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml
index 0ef3f85..e04724a 100644
--- a/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"భాగస్వామ్యం చేయి"</string>
<string name="menu_delete" msgid="8138799623850614177">"తొలగించు"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\"ని ఎంచుకోండి"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"ఫైల్ పరిమాణాన్ని చూపు"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ఫైల్ పరిమాణాన్ని దాచు"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ఎంచుకోబడ్డాయి"</string>
<string name="sort_name" msgid="9183560467917256779">"పేరు ద్వారా"</string>
<string name="sort_date" msgid="586080032956151448">"సవరించిన తేదీ ద్వారా"</string>
diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml
index 55c3d1a..5410d37 100644
--- a/packages/DocumentsUI/res/values-th/strings.xml
+++ b/packages/DocumentsUI/res/values-th/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"แชร์"</string>
<string name="menu_delete" msgid="8138799623850614177">"ลบ"</string>
<string name="menu_select" msgid="8711270657353563424">"เลือก \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"แสดงขนาดไฟล์"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"ซ่อนขนาดไฟล์"</string>
<string name="mode_selected_count" msgid="459111894725594625">"เลือกไว้ <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"ตามชื่อ"</string>
<string name="sort_date" msgid="586080032956151448">"ตามวันที่ที่ปรับเปลี่ยน"</string>
diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml
index 9f5c1e7..3defd6a 100644
--- a/packages/DocumentsUI/res/values-tl/strings.xml
+++ b/packages/DocumentsUI/res/values-tl/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Ibahagi"</string>
<string name="menu_delete" msgid="8138799623850614177">"Tanggalin"</string>
<string name="menu_select" msgid="8711270657353563424">"Piliin ang \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ang pinili"</string>
<string name="sort_name" msgid="9183560467917256779">"Ayon sa pangalan"</string>
<string name="sort_date" msgid="586080032956151448">"Ayon sa petsa ng pagbago"</string>
diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml
index ab8bc89..9f0f846 100644
--- a/packages/DocumentsUI/res/values-tr/strings.xml
+++ b/packages/DocumentsUI/res/values-tr/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Paylaş"</string>
<string name="menu_delete" msgid="8138799623850614177">"Sil"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" dizinini seç"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Dosya boyutunu göster"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Dosya boyutunu gizle"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> tane seçildi"</string>
<string name="sort_name" msgid="9183560467917256779">"Ada göre"</string>
<string name="sort_date" msgid="586080032956151448">"Değişiklik tarihine göre"</string>
diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml
index 964f652..5be1947 100644
--- a/packages/DocumentsUI/res/values-uk/strings.xml
+++ b/packages/DocumentsUI/res/values-uk/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Поділитися"</string>
<string name="menu_delete" msgid="8138799623850614177">"Видалити"</string>
<string name="menu_select" msgid="8711270657353563424">"Вибрати каталог \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Показати розмір файлу"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Сховати розмір файлу"</string>
<string name="mode_selected_count" msgid="459111894725594625">"Вибрано <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"За назвою"</string>
<string name="sort_date" msgid="586080032956151448">"За датою змінення"</string>
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
index 88d25c5..729fc7f 100644
--- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"اشتراک کریں"</string>
<string name="menu_delete" msgid="8138799623850614177">"حذف کریں"</string>
<string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" منتخب کریں"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"فائل سائز دکھائیں"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"فائل سائز چھپائیں"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> کو منتخب کیا گیا"</string>
<string name="sort_name" msgid="9183560467917256779">"نام کے لحاظ سے"</string>
<string name="sort_date" msgid="586080032956151448">"ترمیم کی تاریخ کے لحاظ سے"</string>
diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
index 85b1e5d..db35356 100644
--- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Ulashish"</string>
<string name="menu_delete" msgid="8138799623850614177">"O‘chirish"</string>
<string name="menu_select" msgid="8711270657353563424">"“<xliff:g id="DIRECTORY">^1</xliff:g>” jildini tanlash"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Fayl hajmini ko‘rsatish"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl hajmini berkitish"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> belgilandi"</string>
<string name="sort_name" msgid="9183560467917256779">"Nomi bo‘yicha"</string>
<string name="sort_date" msgid="586080032956151448">"Tahrir sanasi bo‘yicha"</string>
diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml
index 8ce146b..e4bbfda 100644
--- a/packages/DocumentsUI/res/values-vi/strings.xml
+++ b/packages/DocumentsUI/res/values-vi/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Chia sẻ"</string>
<string name="menu_delete" msgid="8138799623850614177">"Xóa"</string>
<string name="menu_select" msgid="8711270657353563424">"Chọn \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_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="mode_selected_count" msgid="459111894725594625">"Đã chọn <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="sort_name" msgid="9183560467917256779">"Theo tên"</string>
<string name="sort_date" msgid="586080032956151448">"Theo ngày sửa đổi"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
index d323980..4a44250 100644
--- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"分享"</string>
<string name="menu_delete" msgid="8138799623850614177">"删除"</string>
<string name="menu_select" msgid="8711270657353563424">"选择“<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"显示文件大小"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"隐藏文件大小"</string>
<string name="mode_selected_count" msgid="459111894725594625">"已选择<xliff:g id="COUNT">%1$d</xliff:g>项"</string>
<string name="sort_name" msgid="9183560467917256779">"按名称"</string>
<string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
index 4df2edd..e245c12 100644
--- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"分享"</string>
<string name="menu_delete" msgid="8138799623850614177">"刪除"</string>
<string name="menu_select" msgid="8711270657353563424">"選取「<xliff:g id="DIRECTORY">^1</xliff:g>」"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
<string name="mode_selected_count" msgid="459111894725594625">"已選取 <xliff:g id="COUNT">%1$d</xliff:g> 個"</string>
<string name="sort_name" msgid="9183560467917256779">"按名稱"</string>
<string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
index 8d01c31..a37dbe8 100644
--- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"共用"</string>
<string name="menu_delete" msgid="8138799623850614177">"刪除"</string>
<string name="menu_select" msgid="8711270657353563424">"選取「<xliff:g id="DIRECTORY">^1</xliff:g>」"</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"隱藏檔案大小"</string>
<string name="mode_selected_count" msgid="459111894725594625">"已選取 <xliff:g id="COUNT">%1$d</xliff:g> 個項目"</string>
<string name="sort_name" msgid="9183560467917256779">"依名稱"</string>
<string name="sort_date" msgid="586080032956151448">"依修改日期"</string>
diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml
index d9793fd..b35da3c 100644
--- a/packages/DocumentsUI/res/values-zu/strings.xml
+++ b/packages/DocumentsUI/res/values-zu/strings.xml
@@ -30,18 +30,12 @@
<string name="menu_share" msgid="3075149983979628146">"Yabelana"</string>
<string name="menu_delete" msgid="8138799623850614177">"Susa"</string>
<string name="menu_select" msgid="8711270657353563424">"Khetha i-\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
- <!-- 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) -->
- <skip />
+ <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_file_size_show" msgid="3240323619260823076">"Bonisa usayizi wefayela"</string>
+ <string name="menu_file_size_hide" msgid="8881975928502581042">"Fihla usayizi wefayela"</string>
<string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> okukhethiwe"</string>
<string name="sort_name" msgid="9183560467917256779">"Ngegama"</string>
<string name="sort_date" msgid="586080032956151448">"Ngedethi yokuguqula"</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
index 3038323..b2e38fc 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
@@ -210,7 +210,7 @@
return pm.getDrawable(info.packageName, icon, info.applicationInfo);
}
} else {
- return context.getResources().getDrawable(icon);
+ return context.getDrawable(icon);
}
}
return null;
@@ -218,19 +218,17 @@
public static Drawable loadMimeIcon(
Context context, String mimeType, String authority, String docId, int mode) {
- final Resources res = context.getResources();
-
if (Document.MIME_TYPE_DIR.equals(mimeType)) {
// TODO: eventually move these hacky assets into that package
if ("com.android.providers.media.documents".equals(authority)
&& docId.startsWith("album")) {
- return res.getDrawable(R.drawable.ic_doc_album);
+ return context.getDrawable(R.drawable.ic_doc_album);
}
if (mode == DocumentsActivity.State.MODE_GRID) {
- return res.getDrawable(R.drawable.ic_grid_folder);
+ return context.getDrawable(R.drawable.ic_grid_folder);
} else {
- return res.getDrawable(R.drawable.ic_doc_folder);
+ return context.getDrawable(R.drawable.ic_doc_folder);
}
}
@@ -238,16 +236,14 @@
}
public static Drawable loadMimeIcon(Context context, String mimeType) {
- final Resources res = context.getResources();
-
if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- return res.getDrawable(R.drawable.ic_doc_folder);
+ return context.getDrawable(R.drawable.ic_doc_folder);
}
// Look for exact match first
Integer resId = sMimeIcons.get(mimeType);
if (resId != null) {
- return res.getDrawable(resId);
+ return context.getDrawable(resId);
}
if (mimeType == null) {
@@ -258,15 +254,15 @@
// Otherwise look for partial match
final String typeOnly = mimeType.split("/")[0];
if ("audio".equals(typeOnly)) {
- return res.getDrawable(R.drawable.ic_doc_audio);
+ return context.getDrawable(R.drawable.ic_doc_audio);
} else if ("image".equals(typeOnly)) {
- return res.getDrawable(R.drawable.ic_doc_image);
+ return context.getDrawable(R.drawable.ic_doc_image);
} else if ("text".equals(typeOnly)) {
- return res.getDrawable(R.drawable.ic_doc_text);
+ return context.getDrawable(R.drawable.ic_doc_text);
} else if ("video".equals(typeOnly)) {
- return res.getDrawable(R.drawable.ic_doc_video);
+ return context.getDrawable(R.drawable.ic_doc_video);
} else {
- return res.getDrawable(R.drawable.ic_doc_generic);
+ return context.getDrawable(R.drawable.ic_doc_generic);
}
}
@@ -276,7 +272,7 @@
final TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(tintAttrId, outValue, true);
- final Drawable icon = res.getDrawable(drawableId);
+ final Drawable icon = context.getDrawable(drawableId);
icon.mutate();
icon.setTintList(res.getColorStateList(outValue.resourceId));
return icon;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
index 82c3048..dd75dbd 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
@@ -221,8 +221,7 @@
final DocumentStack stack = getItem(position);
iconMime.setImageDrawable(stack.root.loadIcon(context));
- final Drawable crumb = context.getResources()
- .getDrawable(R.drawable.ic_breadcrumb_arrow);
+ final Drawable crumb = context.getDrawable(R.drawable.ic_breadcrumb_arrow);
crumb.setBounds(0, 0, crumb.getIntrinsicWidth(), crumb.getIntrinsicHeight());
final SpannableStringBuilder builder = new SpannableStringBuilder();
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
index a358798..fcfe518 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
@@ -205,7 +205,7 @@
public Drawable loadIcon(Context context) {
if (derivedIcon != 0) {
- return context.getResources().getDrawable(derivedIcon);
+ return context.getDrawable(derivedIcon);
} else {
return IconUtils.loadPackageIcon(context, authority, icon);
}
diff --git a/packages/InputDevices/res/values-zh-rCN/strings.xml b/packages/InputDevices/res/values-zh-rCN/strings.xml
index 206f97c..c050ebd 100644
--- a/packages/InputDevices/res/values-zh-rCN/strings.xml
+++ b/packages/InputDevices/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="8016145283189546017">"输入设备"</string>
- <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android 键盘"</string>
+ <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android键盘"</string>
<string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"英语（英国）"</string>
<string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"英语（美国）"</string>
<string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"英语（美国），国际风格"</string>
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/Keyguard/res/values-h560dp/dimens.xml
similarity index 76%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to packages/Keyguard/res/values-h560dp/dimens.xml
index 89f4a0b..1683113 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/Keyguard/res/values-h560dp/dimens.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -16,7 +15,6 @@
~ limitations under the License
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
+<resources>
+ <dimen name="widget_big_font_size">96dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/packages/Keyguard/res/values-hy-rAM/strings.xml b/packages/Keyguard/res/values-hy-rAM/strings.xml
index 0a4c8e0..c512fa9 100644
--- a/packages/Keyguard/res/values-hy-rAM/strings.xml
+++ b/packages/Keyguard/res/values-hy-rAM/strings.xml
@@ -106,7 +106,7 @@
<string name="kg_wrong_pin" msgid="1131306510833563801">"Սխալ PIN"</string>
<string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Փորձեք կրկին <xliff:g id="NUMBER">%d</xliff:g> վայրկյանից:"</string>
<string name="kg_pattern_instructions" msgid="398978611683075868">"Հավաքեք ձեր սխեման"</string>
- <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Մուտքագրեք SIM-ի PIN-ը"</string>
+ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Մուտքագրեք SIM-քարտի PIN-կոդը"</string>
<string name="kg_pin_instructions" msgid="2377242233495111557">"Մուտքագրեք PIN-ը"</string>
<string name="kg_password_instructions" msgid="5753646556186936819">"Մուտքագրեք գաղտնաբառը"</string>
<string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-ը այս պահին անջատված է: Մուտքագրեք PUK կոդը շարունակելու համար: Մանրամասների համար կապվեք օպերատորի հետ:"</string>
diff --git a/packages/Keyguard/res/values-km-rKH/strings.xml b/packages/Keyguard/res/values-km-rKH/strings.xml
index c26b1b4..ecdad8c 100644
--- a/packages/Keyguard/res/values-km-rKH/strings.xml
+++ b/packages/Keyguard/res/values-km-rKH/strings.xml
@@ -83,7 +83,7 @@
<string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
<string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
<string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string>
- <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"បោះបង់"</string>
+ <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"បោះបង់"</string>
<string name="keyboardview_keycode_delete" msgid="3337914833206635744">"លុប"</string>
<string name="keyboardview_keycode_done" msgid="1992571118466679775">"រួចរាល់"</string>
<string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"ប្ដូររបៀប"</string>
@@ -120,7 +120,7 @@
<string name="kg_login_too_many_attempts" msgid="6486842094005698475">"ព្យាយាមលំនាំច្រើនពេក"</string>
<string name="kg_login_instructions" msgid="1100551261265506448">"ដើម្បីដោះសោ ចូលក្នុងគណនី Google ។"</string>
<string name="kg_login_username_hint" msgid="5718534272070920364">"ឈ្មោះអ្នកប្រើ (អ៊ីម៉ែល)"</string>
- <string name="kg_login_password_hint" msgid="9057289103827298549">"ពាក្យសម្ងាត់"</string>
+ <string name="kg_login_password_hint" msgid="9057289103827298549">"ពាក្យសម្ងាត់"</string>
<string name="kg_login_submit_button" msgid="5355904582674054702">"ចូល"</string>
<string name="kg_login_invalid_input" msgid="5754664119319872197">"ឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។"</string>
<string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"ភ្លេចឈ្មោះអ្នកប្រើ ឬពាក្យសម្ងាត់របស់អ្នក?\nមើល "<b>"google.com/accounts/recovery"</b>" ។"</string>
diff --git a/packages/Keyguard/res/values-my-rMM/strings.xml b/packages/Keyguard/res/values-my-rMM/strings.xml
index f7d51bb..03bd133 100644
--- a/packages/Keyguard/res/values-my-rMM/strings.xml
+++ b/packages/Keyguard/res/values-my-rMM/strings.xml
@@ -20,16 +20,16 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="719438068451601849">"သော့ချက် စောင့်ပေးသူ"</string>
- <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN ကုဒ် ရိုက်ထည့်ပါ"</string>
+ <string name="app_name" msgid="719438068451601849">"သော့ချက် စောင့်ပေးသူ"</string>
+ <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN ကုဒ် ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"ဆင်းမ်ကဒ် ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် နှင့် လျို့ဝှက်နံပါတ်သစ် ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"ဆင်းမ်ကဒ် ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် နံပါတ်"</string>
<string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"ဆင်းမ်ကဒ် လျို့ဝှက်ပင်နံပါတ် အသစ်သွင်းရန်"</string>
<string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"စကားဝှက် ရိုက်ရန် ထိပါ"</font></string>
- <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"သော့ဖွင့်ရန် စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
- <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"သော့ဖွင့်ရန် PIN ကို ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"သော့ဖွင့်ရန် စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
+ <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"သော့ဖွင့်ရန် PIN ကို ရိုက်ထည့်ပါ"</string>
<string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"ပင်နံပါတ်မှားနေပါသည်"</string>
- <string name="keyguard_label_text" msgid="861796461028298424">"သော့ဖွင့်ရန် Menu ထိုနောက်0ကိုနှိပ်ပါ"</string>
+ <string name="keyguard_label_text" msgid="861796461028298424">"သော့ဖွင့်ရန် Menu ထိုနောက်0ကိုနှိပ်ပါ"</string>
<string name="faceunlock_multiple_failures" msgid="754137583022792429">"မျက်မှာမှတ် သော့ဖွင့်ခြင်း ခွင့်ပြုသော အကြိမ်ရေထက် ကျော်လွန်သွားပါပြီ"</string>
<string name="keyguard_charged" msgid="3272223906073492454">"အားသွင်းနေပါသည်"</string>
<string name="keyguard_plugged_in" msgid="9087497435553252863">"အားသွင်းနေ"</string>
@@ -85,14 +85,14 @@
<string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Altခလုတ်"</string>
<string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"ပယ်ဖျက်ရန်ခလုတ်"</string>
<string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်ခလုတ်"</string>
- <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string>
+ <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string>
<string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"စနစ်ပြောင်းခြင်းခလုတ်"</string>
<string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shiftခလုတ်"</string>
<string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enterခလုတ်"</string>
- <string name="description_target_unlock" msgid="2228524900439801453">"ဖွင့်ရန်"</string>
+ <string name="description_target_unlock" msgid="2228524900439801453">"ဖွင့်ရန်"</string>
<string name="description_target_camera" msgid="969071997552486814">"ကင်မရာ"</string>
<string name="description_target_silent" msgid="893551287746522182">"အသံတိတ်ရန်"</string>
- <string name="description_target_soundon" msgid="30052466675500172">"အသံဖွင့်သည်"</string>
+ <string name="description_target_soundon" msgid="30052466675500172">"အသံဖွင့်သည်"</string>
<string name="description_target_search" msgid="3091587249776033139">"ရှာဖွေရန်"</string>
<string name="description_direction_up" msgid="7169032478259485180">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် အပေါ်ကို ပွတ်ဆွဲပါ"</string>
<string name="description_direction_down" msgid="5087739728639014595">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် အောက်ကို ပွတ်ဆွဲပါ"</string>
diff --git a/packages/Keyguard/res/values-sv/strings.xml b/packages/Keyguard/res/values-sv/strings.xml
index a3c7295..c7ba630 100644
--- a/packages/Keyguard/res/values-sv/strings.xml
+++ b/packages/Keyguard/res/values-sv/strings.xml
@@ -32,7 +32,7 @@
<string name="keyguard_label_text" msgid="861796461028298424">"Tryck på Menu och sedan på 0 om du vill låsa upp."</string>
<string name="faceunlock_multiple_failures" msgid="754137583022792429">"Du har försökt låsa upp med Ansiktslås för många gånger"</string>
<string name="keyguard_charged" msgid="3272223906073492454">"Batteriet har laddats"</string>
- <string name="keyguard_plugged_in" msgid="9087497435553252863">"Debitering"</string>
+ <string name="keyguard_plugged_in" msgid="9087497435553252863">"Laddar"</string>
<string name="keyguard_low_battery" msgid="8143808018719173859">"Anslut din laddare."</string>
<string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"Tryck på Meny om du vill låsa upp."</string>
<string name="keyguard_network_locked_message" msgid="9169717779058037168">"Nätverk låst"</string>
diff --git a/packages/Keyguard/res/values-sw600dp-land/dimens.xml b/packages/Keyguard/res/values-sw600dp-land/dimens.xml
index 13a6f62..89252cf 100644
--- a/packages/Keyguard/res/values-sw600dp-land/dimens.xml
+++ b/packages/Keyguard/res/values-sw600dp-land/dimens.xml
@@ -25,5 +25,5 @@
<dimen name="kg_status_line_font_right_margin">16dp</dimen>
<!-- Overload default clock widget parameters -->
- <dimen name="widget_big_font_size">88dp</dimen>
+ <dimen name="widget_big_font_size">100dp</dimen>
</resources>
\ No newline at end of file
diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/Keyguard/res/values-sw600dp/dimens.xml
index 69bf44f..74be1ff 100644
--- a/packages/Keyguard/res/values-sw600dp/dimens.xml
+++ b/packages/Keyguard/res/values-sw600dp/dimens.xml
@@ -63,7 +63,7 @@
<dimen name="keyguard_muliuser_selector_margin">12dp</dimen>
<!-- Overload default clock widget parameters -->
- <dimen name="widget_big_font_size">120dp</dimen>
+ <dimen name="widget_big_font_size">140dp</dimen>
<dimen name="widget_label_font_size">16sp</dimen>
<dimen name="bottom_text_spacing_digital">-16dp</dimen>
diff --git a/packages/Keyguard/res/values-sw720dp-land/dimens.xml b/packages/Keyguard/res/values-sw720dp-land/dimens.xml
index 14726ab..731bb64 100644
--- a/packages/Keyguard/res/values-sw720dp-land/dimens.xml
+++ b/packages/Keyguard/res/values-sw720dp-land/dimens.xml
@@ -26,4 +26,6 @@
<!-- Horizontal padding for the widget pager -->
<dimen name="kg_widget_pager_horizontal_padding">32dp</dimen>
+
+ <dimen name="widget_big_font_size">150dp</dimen>
</resources>
diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/Keyguard/res/values-sw720dp/dimens.xml
index c487072..3e89a84 100644
--- a/packages/Keyguard/res/values-sw720dp/dimens.xml
+++ b/packages/Keyguard/res/values-sw720dp/dimens.xml
@@ -61,4 +61,5 @@
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_height">420dp</dimen>
+ <dimen name="widget_big_font_size">150dp</dimen>
</resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/strings.xml b/packages/Keyguard/res/values-zh-rCN/strings.xml
index 1e124b8..8ea80bb 100644
--- a/packages/Keyguard/res/values-zh-rCN/strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/strings.xml
@@ -118,7 +118,7 @@
<string name="kg_invalid_puk" msgid="3638289409676051243">"请重新输入正确的PUK码。如果尝试错误次数过多，SIM卡将永久停用。"</string>
<string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN 码不匹配"</string>
<string name="kg_login_too_many_attempts" msgid="6486842094005698475">"图案尝试次数过多"</string>
- <string name="kg_login_instructions" msgid="1100551261265506448">"要解锁，请登录您的 Google 帐户。"</string>
+ <string name="kg_login_instructions" msgid="1100551261265506448">"要解锁，请登录您的Google帐户。"</string>
<string name="kg_login_username_hint" msgid="5718534272070920364">"用户名（电子邮件地址）"</string>
<string name="kg_login_password_hint" msgid="9057289103827298549">"密码"</string>
<string name="kg_login_submit_button" msgid="5355904582674054702">"登录"</string>
diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml
index e822c82..bfc0531 100644
--- a/packages/Keyguard/res/values/dimens.xml
+++ b/packages/Keyguard/res/values/dimens.xml
@@ -161,7 +161,7 @@
<dimen name="bottom_text_spacing_digital">-10dp</dimen>
<dimen name="label_font_size">14dp</dimen>
<dimen name="widget_label_font_size">16sp</dimen>
- <dimen name="widget_big_font_size">96dp</dimen>
+ <dimen name="widget_big_font_size">88dp</dimen>
<dimen name="big_font_size">120dp</dimen>
<!-- The y translation to apply at the start in appear animations. -->
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
index 25f3383..32f7a1e 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
@@ -36,6 +36,7 @@
import android.provider.MediaStore;
import android.util.Log;
import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
import com.android.keyguard.KeyguardHostView.OnDismissAction;
@@ -214,9 +215,9 @@
private void dismissKeyguardOnNextActivity() {
try {
- ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
+ WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
} catch (RemoteException e) {
- Log.w(TAG, "can't dismiss keyguard on launch");
+ Log.w(TAG, "Error dismissing keyguard", e);
}
}
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimpleHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimpleHostView.java
index bc159cb..828c921 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimpleHostView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimpleHostView.java
@@ -68,5 +68,17 @@
public void onUserSwitchComplete(int userId) {
getSecurityContainer().showPrimarySecurityScreen(false /* turning off */);
}
+
+ @Override
+ public void onTrustInitiatedByUser(int userId) {
+ if (userId != mLockPatternUtils.getCurrentUser()) return;
+ if (!isAttachedToWindow()) return;
+
+ if (isVisibleToUser()) {
+ dismiss(false /* authenticated */);
+ } else {
+ mViewMediatorCallback.playTrustedSound();
+ }
+ }
};
}
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
index daba0a2..51a276e 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
@@ -16,9 +16,10 @@
package com.android.keyguard;
-import android.app.AlarmClockInfo;
+import android.app.AlarmManager;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.provider.AlarmClock;
import android.text.TextUtils;
@@ -26,6 +27,7 @@
import android.util.AttributeSet;
import android.util.Log;
import android.util.Slog;
+import android.util.TypedValue;
import android.view.View;
import android.widget.GridLayout;
import android.widget.TextClock;
@@ -115,8 +117,19 @@
mClockView.setElegantTextHeight(false);
}
+ @Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ mClockView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(R.dimen.widget_big_font_size));
+ mDateView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(R.dimen.widget_label_font_size));
+ mOwnerInfo.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(R.dimen.widget_label_font_size));
+ }
+
protected void refresh() {
- AlarmClockInfo nextAlarm = mLockPatternUtils.getNextAlarm();
+ AlarmManager.AlarmClockInfo nextAlarm = mLockPatternUtils.getNextAlarm();
Patterns.update(mContext, nextAlarm != null);
mDateView.setFormat24Hour(Patterns.dateView);
@@ -128,7 +141,7 @@
refreshAlarmStatus(nextAlarm);
}
- void refreshAlarmStatus(AlarmClockInfo nextAlarm) {
+ void refreshAlarmStatus(AlarmManager.AlarmClockInfo nextAlarm) {
if (nextAlarm != null) {
mAlarmStatusView.setText(formatNextAlarm(mContext, nextAlarm));
mAlarmStatusView.setVisibility(View.VISIBLE);
@@ -137,7 +150,7 @@
}
}
- public static String formatNextAlarm(Context context, AlarmClockInfo info) {
+ public static String formatNextAlarm(Context context, AlarmManager.AlarmClockInfo info) {
if (info == null) {
return "";
}
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 0d79ee2..dc12cc7 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -218,7 +218,7 @@
handleFingerprintProcessed(msg.arg1);
break;
case MSG_FACE_UNLOCK_STATE_CHANGED:
- handleFaceUnlockStateChanged(msg.arg1 != 0);
+ handleFaceUnlockStateChanged(msg.arg1 != 0, msg.arg2);
break;
}
}
@@ -227,6 +227,7 @@
private SparseBooleanArray mUserHasTrust = new SparseBooleanArray();
private SparseBooleanArray mUserTrustIsManaged = new SparseBooleanArray();
private SparseBooleanArray mUserFingerprintRecognized = new SparseBooleanArray();
+ private SparseBooleanArray mUserFaceUnlockRunning = new SparseBooleanArray();
@Override
public void onTrustChanged(boolean enabled, int userId, boolean initiatedByUser) {
@@ -297,15 +298,20 @@
}
}
- private void handleFaceUnlockStateChanged(boolean running) {
+ private void handleFaceUnlockStateChanged(boolean running, int userId) {
+ mUserFaceUnlockRunning.put(userId, running);
for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) {
- cb.onFaceUnlockStateChanged(running);
+ cb.onFaceUnlockStateChanged(running, userId);
}
}
}
+ public boolean isFaceUnlockRunning(int userId) {
+ return mUserFaceUnlockRunning.get(userId);
+ }
+
private boolean isTrustDisabled(int userId) {
final DevicePolicyManager dpm =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
@@ -398,9 +404,11 @@
} else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
dispatchBootCompleted();
} else if (ACTION_FACE_UNLOCK_STARTED.equals(action)) {
- mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 1, 0));
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 1,
+ getSendingUserId()));
} else if (ACTION_FACE_UNLOCK_STOPPED.equals(action)) {
- mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 0, 0));
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_FACE_UNLOCK_STATE_CHANGED, 0,
+ getSendingUserId()));
}
}
};
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
index 0acb9d0..33cab8f 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
@@ -197,5 +197,5 @@
/**
* Called when the state of face unlock changed.
*/
- public void onFaceUnlockStateChanged(boolean running) { }
+ public void onFaceUnlockStateChanged(boolean running, int userId) { }
}
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
index d9c5a53..e35b2b2 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
@@ -237,7 +237,7 @@
}
public void startDisappearAnimation(Runnable finishRunnable) {
- if (!mSecurityContainer.startDisappearAnimation(finishRunnable)) {
+ if (!mSecurityContainer.startDisappearAnimation(finishRunnable) && finishRunnable != null) {
finishRunnable.run();
}
}
diff --git a/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java b/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java
index f74843e..0c9dbc4 100644
--- a/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java
+++ b/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java
@@ -61,4 +61,14 @@
* Report when keyguard is actually gone
*/
void keyguardGone();
+
+ /**
+ * Report when the UI is ready for dismissing the whole Keyguard.
+ */
+ void readyForKeyguardDone();
+
+ /**
+ * Play the "device trusted" sound.
+ */
+ void playTrustedSound();
}
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
index ed17494..4ea1c77 100644
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
+++ b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
@@ -31,6 +31,16 @@
public class SampleTrustAgent extends TrustAgentService
implements SharedPreferences.OnSharedPreferenceChangeListener {
+ /**
+ * If true, allows anyone to control this trust agent, e.g. using adb:
+ * <pre>
+ * $ adb shell am broadcast -a action.sample_trust_agent.grant_trust\
+ * -e extra.message SampleTrust\
+ * --el extra.duration 1000 --ez extra.init_by_user false
+ * </pre>
+ */
+ private static final boolean ALLOW_EXTERNAL_BROADCASTS = false;
+
LocalBroadcastManager mLocalBroadcastManager;
private static final String ACTION_GRANT_TRUST = "action.sample_trust_agent.grant_trust";
@@ -38,7 +48,7 @@
private static final String EXTRA_MESSAGE = "extra.message";
private static final String EXTRA_DURATION = "extra.duration";
- private static final String EXTRA_EXTRA = "extra.extra";
+ private static final String EXTRA_INITIATED_BY_USER = "extra.init_by_user";
private static final String PREFERENCE_REPORT_UNLOCK_ATTEMPTS
= "preference.report_unlock_attempts";
@@ -50,11 +60,16 @@
@Override
public void onCreate() {
super.onCreate();
+ mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
+
IntentFilter filter = new IntentFilter();
filter.addAction(ACTION_GRANT_TRUST);
filter.addAction(ACTION_REVOKE_TRUST);
- mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
mLocalBroadcastManager.registerReceiver(mReceiver, filter);
+ if (ALLOW_EXTERNAL_BROADCASTS) {
+ registerReceiver(mReceiver, filter);
+ }
+
setManagingTrust(getIsManagingTrust(this));
PreferenceManager.getDefaultSharedPreferences(this)
.registerOnSharedPreferenceChangeListener(this);
@@ -79,6 +94,9 @@
public void onDestroy() {
super.onDestroy();
mLocalBroadcastManager.unregisterReceiver(mReceiver);
+ if (ALLOW_EXTERNAL_BROADCASTS) {
+ unregisterReceiver(mReceiver);
+ }
PreferenceManager.getDefaultSharedPreferences(this)
.unregisterOnSharedPreferenceChangeListener(this);
}
@@ -91,7 +109,7 @@
try {
grantTrust(intent.getStringExtra(EXTRA_MESSAGE),
intent.getLongExtra(EXTRA_DURATION, 0),
- false /* initiatedByUser */);
+ intent.getBooleanExtra(EXTRA_INITIATED_BY_USER, false));
} catch (IllegalStateException e) {
Toast.makeText(context,
"IllegalStateException: " + e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -103,11 +121,11 @@
};
public static void sendGrantTrust(Context context,
- String message, long durationMs, Bundle extra) {
+ String message, long durationMs, boolean initiatedByUser) {
Intent intent = new Intent(ACTION_GRANT_TRUST);
intent.putExtra(EXTRA_MESSAGE, message);
intent.putExtra(EXTRA_DURATION, durationMs);
- intent.putExtra(EXTRA_EXTRA, extra);
+ intent.putExtra(EXTRA_INITIATED_BY_USER, initiatedByUser);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
}
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
index 2c85609..bea74ab 100644
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
+++ b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
@@ -59,7 +59,7 @@
int id = v.getId();
if (id == R.id.enable_trust) {
SampleTrustAgent.sendGrantTrust(this, "SampleTrustAgent", TRUST_DURATION_MS,
- null /* extra */);
+ false /* initiatedByUser */);
} else if (id == R.id.revoke_trust) {
SampleTrustAgent.sendRevokeTrust(this);
} else if (id == R.id.crash) {
diff --git a/packages/PrintSpooler/AndroidManifest.xml b/packages/PrintSpooler/AndroidManifest.xml
index 9a62864..055587a 100644
--- a/packages/PrintSpooler/AndroidManifest.xml
+++ b/packages/PrintSpooler/AndroidManifest.xml
@@ -46,7 +46,7 @@
android:label="@string/app_label"
android:allowBackup= "false"
android:supportsRtl="true"
- android:icon="@*android:drawable/ic_print">
+ android:icon="@drawable/ic_print">
<service
android:name=".model.PrintSpoolerService"
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
deleted file mode 100644
index 09ab1a2..0000000
--- a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
deleted file mode 100644
index 637d94e..0000000
--- a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
deleted file mode 100644
index 4d4b3cc..0000000
--- a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable/ic_print.xml b/packages/PrintSpooler/res/drawable/ic_print.xml
new file mode 100644
index 0000000..dc6e0fb
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable/ic_print.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@*android:drawable/ic_print"
+ android:tint="@color/promoted_action_background_color" />
diff --git a/packages/PrintSpooler/res/drawable/ic_savetopdf.xml b/packages/PrintSpooler/res/drawable/ic_savetopdf.xml
new file mode 100644
index 0000000..60ed33a
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable/ic_savetopdf.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_menu_savetopdf"
+ android:tint="@color/promoted_action_background_color" />
diff --git a/packages/PrintSpooler/res/layout/preview_page.xml b/packages/PrintSpooler/res/layout/preview_page.xml
index 509a1d2..76dd76b 100644
--- a/packages/PrintSpooler/res/layout/preview_page.xml
+++ b/packages/PrintSpooler/res/layout/preview_page.xml
@@ -31,7 +31,7 @@
<RelativeLayout
android:id="@+id/page_footer"
android:layout_width="fill_parent"
- android:layout_height="32dip"
+ android:layout_height="@dimen/preview_page_footer_height"
android:background="@*android:color/material_grey_500"
android:orientation="horizontal">
diff --git a/packages/PrintSpooler/res/layout/print_activity.xml b/packages/PrintSpooler/res/layout/print_activity.xml
index 3905646..ee5d42a 100644
--- a/packages/PrintSpooler/res/layout/print_activity.xml
+++ b/packages/PrintSpooler/res/layout/print_activity.xml
@@ -27,7 +27,6 @@
android:id="@+id/static_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="16dip"
android:elevation="@dimen/preview_controls_elevation"
android:background="?android:attr/colorPrimary">
@@ -35,6 +34,7 @@
android:id="@+id/destination_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="4dip"
android:dropDownWidth="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
</Spinner>
@@ -56,7 +56,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
android:layout_marginStart="12dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:labelFor="@+id/copies_count_summary"
@@ -67,7 +66,6 @@
android:id="@+id/copies_count_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
android:layout_marginStart="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary">
@@ -76,7 +74,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
android:layout_marginStart="32dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:labelFor="@+id/paper_size_summary"
@@ -87,7 +84,6 @@
android:id="@+id/paper_size_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
android:layout_marginStart="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary">
diff --git a/packages/PrintSpooler/res/layout/print_activity_controls.xml b/packages/PrintSpooler/res/layout/print_activity_controls.xml
index ef6044a..31bda7e 100644
--- a/packages/PrintSpooler/res/layout/print_activity_controls.xml
+++ b/packages/PrintSpooler/res/layout/print_activity_controls.xml
@@ -267,8 +267,8 @@
android:id="@+id/expand_collapse_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
- android:layout_marginBottom="8dip"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
android:layout_gravity="center"
android:background="@drawable/ic_expand_more">
</ImageView>
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml
index bf82957..edda7e9 100644
--- a/packages/PrintSpooler/res/values-km-rKH/strings.xml
+++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml
@@ -62,7 +62,7 @@
</plurals>
<string name="cancel" msgid="4373674107267141885">"បោះបង់"</string>
<string name="restart" msgid="2472034227037808749">"ចាប់ផ្ដើមឡើងវិញ"</string>
- <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string>
+ <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string>
<string name="reason_unknown" msgid="5507940196503246139">"មិនស្គាល់"</string>
<string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – មិនអាចប្រើបាន"</string>
<string-array name="color_mode_labels">
diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml
index 04da765..8d0320e 100644
--- a/packages/PrintSpooler/res/values-my-rMM/strings.xml
+++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml
@@ -77,5 +77,5 @@
<string name="print_error_default_message" msgid="8602678405502922346">"ဆော်ရီး၊ အဲဒါ အလုပ်မဖြစ်ခဲ့ပါ။ ထပ် စမ်းပါ။"</string>
<string name="print_error_retry" msgid="1426421728784259538">"ထပ်စမ်း"</string>
<string name="print_error_printer_unavailable" msgid="8985614415253203381">"ဒီပရင်တာမှာ ယခုအချိန်မှာ မရနိုင်ပါ။"</string>
- <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string>
+ <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string>
</resources>
diff --git a/packages/PrintSpooler/res/values/constants.xml b/packages/PrintSpooler/res/values/constants.xml
index faad527..b95703b 100644
--- a/packages/PrintSpooler/res/values/constants.xml
+++ b/packages/PrintSpooler/res/values/constants.xml
@@ -45,4 +45,7 @@
<fraction name="page_selected_alpha">100%</fraction>
<fraction name="page_unselected_alpha">50%</fraction>
+ <dimen name="preview_page_footer_height">32dip</dimen>
+ <dimen name="preview_page_min_width">130dip</dimen>
+
</resources>
diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml
index db319e9..08702291 100644
--- a/packages/PrintSpooler/res/values/themes.xml
+++ b/packages/PrintSpooler/res/values/themes.xml
@@ -16,7 +16,10 @@
<resources>
- <style name="PrintActivity" parent="@android:style/Theme.Material.Settings">
+ <style name="PrintActivity" parent="@android:style/Theme.Material">
+ <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item>
+ <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item>
+ <item name="android:colorAccent">@*android:color/material_deep_teal_A500</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
index 3134e93..5233c79 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
@@ -124,7 +124,9 @@
.setContentText(printJob.getPrinterName())
.setWhen(System.currentTimeMillis())
.setOngoing(true)
- .setShowWhen(true);
+ .setShowWhen(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationManager.notify(0, builder.build());
}
@@ -140,7 +142,9 @@
.setContentText(printJob.getPrinterName())
.setWhen(System.currentTimeMillis())
.setOngoing(true)
- .setShowWhen(true);
+ .setShowWhen(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationManager.notify(0, builder.build());
}
@@ -154,7 +158,9 @@
.setContentText(printJob.getPrinterName())
.setWhen(System.currentTimeMillis())
.setOngoing(true)
- .setShowWhen(true);
+ .setShowWhen(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationManager.notify(0, builder.build());
}
@@ -166,7 +172,9 @@
.setContentText(printJob.getPrinterName())
.setWhen(System.currentTimeMillis())
.setOngoing(true)
- .setShowWhen(true);
+ .setShowWhen(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationManager.notify(0, builder.build());
}
@@ -198,6 +206,8 @@
builder.setNumber(printJobCount);
builder.setStyle(inboxStyle);
+ builder.setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationManager.notify(0, builder.build());
}
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
index e976936..5bcdb9f 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java
@@ -96,6 +96,7 @@
private float mUnselectedPageAlpha;
private int mPreviewPageMargin;
+ private int mPreviewPageMinWidth;
private int mPreviewListPadding;
private int mFooterHeight;
@@ -141,17 +142,17 @@
mPreviewPageMargin = mContext.getResources().getDimensionPixelSize(
R.dimen.preview_page_margin);
+ mPreviewPageMinWidth = mContext.getResources().getDimensionPixelSize(
+ R.dimen.preview_page_min_width);
+
mPreviewListPadding = mContext.getResources().getDimensionPixelSize(
R.dimen.preview_list_padding);
mColumnCount = mContext.getResources().getInteger(
R.integer.preview_page_per_row_count);
- TypedValue outValue = new TypedValue();
- mContext.getTheme().resolveAttribute(
- com.android.internal.R.attr.listPreferredItemHeightSmall, outValue, true);
- mFooterHeight = TypedValue.complexToDimensionPixelSize(outValue.data,
- mContext.getResources().getDisplayMetrics());
+ mFooterHeight = mContext.getResources().getDimensionPixelSize(
+ R.dimen.preview_page_footer_height);
mPreviewArea = previewArea;
@@ -428,8 +429,12 @@
// Compute max page height.
final int pageContentDesiredHeight = (int) (((float) pageContentDesiredWidth
/ pageAspectRatio) + 0.5f);
- final int pageContentMaxHeight = availableHeight - 2 * (mPreviewListPadding
- + mPreviewPageMargin) - mFooterHeight;
+
+ // If the page does not fit entirely in a vertial direction,
+ // we shirk it but not less than the minimal page width.
+ final int pageContentMinHeight = (int) (mPreviewPageMinWidth / pageAspectRatio + 0.5f);
+ final int pageContentMaxHeight = Math.max(pageContentMinHeight,
+ availableHeight - 2 * (mPreviewListPadding + mPreviewPageMargin) - mFooterHeight);
mPageContentHeight = Math.min(pageContentDesiredHeight, pageContentMaxHeight);
mPageContentWidth = (int) ((mPageContentHeight * pageAspectRatio) + 0.5f);
@@ -439,10 +444,17 @@
final int rowCount = mSelectedPageCount / columnCount
+ ((mSelectedPageCount % columnCount) > 0 ? 1 : 0);
- final int totalContentHeight = rowCount* (mPageContentHeight + mFooterHeight + 2
+ final int totalContentHeight = rowCount * (mPageContentHeight + mFooterHeight + 2
* mPreviewPageMargin);
- final int verticalPadding = Math.max(mPreviewListPadding,
- (availableHeight - totalContentHeight) / 2);
+
+ final int verticalPadding;
+ if (mPageContentHeight + mFooterHeight + mPreviewListPadding > availableHeight) {
+ verticalPadding = Math.max(mPreviewPageMargin,
+ (availableHeight - totalContentHeight) / 2);
+ } else {
+ verticalPadding = Math.max(mPreviewListPadding,
+ (availableHeight - totalContentHeight) / 2);
+ }
mPreviewArea.setPadding(horizontalPadding, verticalPadding,
horizontalPadding, verticalPadding);
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index a1b1aec..6b29e5f 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -1704,7 +1704,7 @@
if (position == 0 && getPdfPrinter() != null) {
PrinterHolder printerHolder = (PrinterHolder) getItem(position);
title = printerHolder.printer.getName();
- icon = getResources().getDrawable(com.android.internal.R.drawable.ic_menu_save);
+ icon = getResources().getDrawable(R.drawable.ic_savetopdf);
} else if (position == 1) {
title = getString(R.string.all_printers);
}
@@ -1712,7 +1712,7 @@
if (position == 1 && getPdfPrinter() != null) {
PrinterHolder printerHolder = (PrinterHolder) getItem(position);
title = printerHolder.printer.getName();
- icon = getResources().getDrawable(com.android.internal.R.drawable.ic_menu_save);
+ icon = getResources().getDrawable(R.drawable.ic_savetopdf);
} else if (position == getCount() - 1) {
title = getString(R.string.all_printers);
} else {
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
index 7715579..3905bada 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
@@ -96,7 +96,7 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- getActionBar().setIcon(R.drawable.ic_menu_print);
+ getActionBar().setIcon(R.drawable.ic_print);
setContentView(R.layout.select_printer_activity);
diff --git a/packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java b/packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
index 4d2cb6c..8365373 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
@@ -94,7 +94,7 @@
mMinMargins = minMargins;
mContentRequested = false;
- // If there is not provider we want immediately to switch to
+ // If there is no provider we want immediately to switch to
// the empty state, so pages with no content appear blank.
if (mProvider == null && getBackground() != mEmptyState) {
setBackground(mEmptyState);
diff --git a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java
index 01f4a04..71f4aa7 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/widget/PrintOptionsLayout.java
@@ -162,7 +162,7 @@
}
cellStart = getPaddingStart();
- cellTop += cellTop + rowHeight;
+ cellTop += rowHeight;
}
}
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 478a5de..299e50c 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -73,6 +73,7 @@
<integer name="def_lockscreen_sounds_enabled">1</integer>
<string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>
<string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
+ <string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>
<string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>
<bool name="def_lockscreen_disabled">false</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 7c92cde..13301fb 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -70,7 +70,7 @@
// database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'
// is properly propagated through your change. Not doing so will result in a loss of user
// settings.
- private static final int DATABASE_VERSION = 106;
+ private static final int DATABASE_VERSION = 107;
private Context mContext;
private int mUserHandle;
@@ -1694,6 +1694,26 @@
}
upgradeVersion = 106;
}
+
+ if (upgradeVersion < 107) {
+ // Add trusted sound setting
+ if (mUserHandle == UserHandle.USER_OWNER) {
+ db.beginTransaction();
+ SQLiteStatement stmt = null;
+ try {
+ stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)"
+ + " VALUES(?,?);");
+ loadStringSetting(stmt, Settings.Global.TRUSTED_SOUND,
+ R.string.def_trusted_sound);
+ db.setTransactionSuccessful();
+ } finally {
+ db.endTransaction();
+ if (stmt != null) stmt.close();
+ }
+ }
+ upgradeVersion = 107;
+ }
+
// *** Remember to update DATABASE_VERSION above!
if (upgradeVersion != currentVersion) {
@@ -2373,6 +2393,8 @@
R.string.def_lock_sound);
loadStringSetting(stmt, Settings.Global.UNLOCK_SOUND,
R.string.def_unlock_sound);
+ loadStringSetting(stmt, Settings.Global.TRUSTED_SOUND,
+ R.string.def_trusted_sound);
loadIntegerSetting(stmt, Settings.Global.POWER_SOUNDS_ENABLED,
R.integer.def_power_sounds_enabled);
loadStringSetting(stmt, Settings.Global.LOW_BATTERY_SOUND,
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 5dc7d26..87c015c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -20,6 +20,7 @@
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -94,6 +95,9 @@
// Each defined user has their own settings
protected final SparseArray<DatabaseHelper> mOpenHelpers = new SparseArray<DatabaseHelper>();
+ // Keep the list of managed profiles synced here
+ private List<UserInfo> mManagedProfiles = null;
+
// Over this size we don't reject loading or saving settings but
// we do consider them broken/malicious and don't keep them in
// memory at least:
@@ -119,6 +123,9 @@
private static final String DROPBOX_TAG_USERLOG = "restricted_profile_ssaid";
+ static final HashSet<String> sSecureCloneToManagedKeys;
+ static final HashSet<String> sSystemCloneToManagedKeys;
+
static {
// Keys (name column) from the 'secure' table that are now in the owner user's 'global'
// table, shared across all users
@@ -142,6 +149,15 @@
UserManager.ENSURE_VERIFY_APPS);
sRestrictedKeys.put(Settings.Global.PREFERRED_NETWORK_MODE,
UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+
+ sSecureCloneToManagedKeys = new HashSet<String>();
+ for (int i = 0; i < Settings.Secure.CLONE_TO_MANAGED_PROFILE.length; i++) {
+ sSecureCloneToManagedKeys.add(Settings.Secure.CLONE_TO_MANAGED_PROFILE[i]);
+ }
+ sSystemCloneToManagedKeys = new HashSet<String>();
+ for (int i = 0; i < Settings.System.CLONE_TO_MANAGED_PROFILE.length; i++) {
+ sSystemCloneToManagedKeys.add(Settings.System.CLONE_TO_MANAGED_PROFILE[i]);
+ }
}
private boolean settingMovedToGlobal(final String name) {
@@ -362,18 +378,22 @@
IntentFilter userFilter = new IntentFilter();
userFilter.addAction(Intent.ACTION_USER_REMOVED);
+ userFilter.addAction(Intent.ACTION_USER_ADDED);
getContext().registerReceiver(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
+ final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
+ UserHandle.USER_OWNER);
if (intent.getAction().equals(Intent.ACTION_USER_REMOVED)) {
- final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
- UserHandle.USER_OWNER);
- if (userHandle != UserHandle.USER_OWNER) {
- onUserRemoved(userHandle);
- }
+ onUserRemoved(userHandle);
+ } else if (intent.getAction().equals(Intent.ACTION_USER_ADDED)) {
+ onProfilesChanged();
}
}
}, userFilter);
+
+ onProfilesChanged();
+
return true;
}
@@ -391,6 +411,32 @@
sSystemCaches.delete(userHandle);
sSecureCaches.delete(userHandle);
sKnownMutationsInFlight.delete(userHandle);
+ onProfilesChanged();
+ }
+ }
+
+ /**
+ * Updates the list of managed profiles. It assumes that only the primary user
+ * can have managed profiles. Modify this code if that changes in the future.
+ */
+ void onProfilesChanged() {
+ synchronized (this) {
+ mManagedProfiles = mUserManager.getProfiles(UserHandle.USER_OWNER);
+ if (mManagedProfiles != null) {
+ // Remove the primary user from the list
+ for (int i = mManagedProfiles.size() - 1; i >= 0; i--) {
+ if (mManagedProfiles.get(i).id == UserHandle.USER_OWNER) {
+ mManagedProfiles.remove(i);
+ }
+ }
+ // If there are no managed profiles, reset the variable
+ if (mManagedProfiles.size() == 0) {
+ mManagedProfiles = null;
+ }
+ }
+ if (LOCAL_LOGV) {
+ Slog.d(TAG, "Managed Profiles = " + mManagedProfiles);
+ }
}
}
@@ -601,6 +647,24 @@
}
/**
+ * Checks if the calling user is a managed profile of the primary user.
+ * Currently only the primary user (USER_OWNER) can have managed profiles.
+ * @param callingUser the user trying to read/write settings
+ * @return true if it is a managed profile of the primary user
+ */
+ private boolean isManagedProfile(int callingUser) {
+ synchronized (this) {
+ if (mManagedProfiles == null) return false;
+ for (int i = mManagedProfiles.size() - 1; i >= 0; i--) {
+ if (mManagedProfiles.get(i).id == callingUser) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ /**
* Fast path that avoids the use of chatty remoted Cursors.
*/
@Override
@@ -625,12 +689,18 @@
// Get methods
if (Settings.CALL_METHOD_GET_SYSTEM.equals(method)) {
if (LOCAL_LOGV) Slog.v(TAG, "call(system:" + request + ") for " + callingUser);
+ if (isManagedProfile(callingUser) && sSystemCloneToManagedKeys.contains(request)) {
+ callingUser = UserHandle.USER_OWNER;
+ }
dbHelper = getOrEstablishDatabase(callingUser);
cache = sSystemCaches.get(callingUser);
return lookupValue(dbHelper, TABLE_SYSTEM, cache, request);
}
if (Settings.CALL_METHOD_GET_SECURE.equals(method)) {
if (LOCAL_LOGV) Slog.v(TAG, "call(secure:" + request + ") for " + callingUser);
+ if (isManagedProfile(callingUser) && sSecureCloneToManagedKeys.contains(request)) {
+ callingUser = UserHandle.USER_OWNER;
+ }
dbHelper = getOrEstablishDatabase(callingUser);
cache = sSecureCaches.get(callingUser);
return lookupValue(dbHelper, TABLE_SECURE, cache, request);
@@ -667,13 +737,70 @@
values.put(Settings.NameValueTable.NAME, request);
values.put(Settings.NameValueTable.VALUE, newValue);
if (Settings.CALL_METHOD_PUT_SYSTEM.equals(method)) {
- if (LOCAL_LOGV) Slog.v(TAG, "call_put(system:" + request + "=" + newValue + ") for " + callingUser);
+ if (LOCAL_LOGV) {
+ Slog.v(TAG, "call_put(system:" + request + "=" + newValue + ") for "
+ + callingUser);
+ }
+ // Extra check for USER_OWNER to optimize for the 99%
+ if (callingUser != UserHandle.USER_OWNER && isManagedProfile(callingUser)) {
+ if (sSystemCloneToManagedKeys.contains(request)) {
+ // Don't write these settings
+ return null;
+ }
+ }
insertForUser(Settings.System.CONTENT_URI, values, callingUser);
+ // Clone the settings to the managed profiles so that notifications can be sent out
+ if (callingUser == UserHandle.USER_OWNER && mManagedProfiles != null
+ && sSystemCloneToManagedKeys.contains(request)) {
+ final long token = Binder.clearCallingIdentity();
+ try {
+ for (int i = mManagedProfiles.size() - 1; i >= 0; i--) {
+ if (LOCAL_LOGV) {
+ Slog.v(TAG, "putting to additional user "
+ + mManagedProfiles.get(i).id);
+ }
+ insertForUser(Settings.System.CONTENT_URI, values,
+ mManagedProfiles.get(i).id);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
} else if (Settings.CALL_METHOD_PUT_SECURE.equals(method)) {
- if (LOCAL_LOGV) Slog.v(TAG, "call_put(secure:" + request + "=" + newValue + ") for " + callingUser);
+ if (LOCAL_LOGV) {
+ Slog.v(TAG, "call_put(secure:" + request + "=" + newValue + ") for "
+ + callingUser);
+ }
+ // Extra check for USER_OWNER to optimize for the 99%
+ if (callingUser != UserHandle.USER_OWNER && isManagedProfile(callingUser)) {
+ if (sSecureCloneToManagedKeys.contains(request)) {
+ // Don't write these settings
+ return null;
+ }
+ }
insertForUser(Settings.Secure.CONTENT_URI, values, callingUser);
+ // Clone the settings to the managed profiles so that notifications can be sent out
+ if (callingUser == UserHandle.USER_OWNER && mManagedProfiles != null
+ && sSecureCloneToManagedKeys.contains(request)) {
+ final long token = Binder.clearCallingIdentity();
+ try {
+ for (int i = mManagedProfiles.size() - 1; i >= 0; i--) {
+ if (LOCAL_LOGV) {
+ Slog.v(TAG, "putting to additional user "
+ + mManagedProfiles.get(i).id);
+ }
+ insertForUser(Settings.Secure.CONTENT_URI, values,
+ mManagedProfiles.get(i).id);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
} else if (Settings.CALL_METHOD_PUT_GLOBAL.equals(method)) {
- if (LOCAL_LOGV) Slog.v(TAG, "call_put(global:" + request + "=" + newValue + ") for " + callingUser);
+ if (LOCAL_LOGV) {
+ Slog.v(TAG, "call_put(global:" + request + "=" + newValue + ") for "
+ + callingUser);
+ }
insertForUser(Settings.Global.CONTENT_URI, values, callingUser);
} else {
Slog.w(TAG, "call() with invalid method: " + method);
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 6f41565..f1d2bee3 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -90,6 +90,7 @@
<uses-permission android:name="android.permission.RETRIEVE_WINDOW_TOKEN" />
<uses-permission android:name="android.permission.FRAME_STATS" />
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
+ <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
<application android:label="@string/app_label">
<provider
diff --git a/packages/Shell/src/com/android/shell/BugreportReceiver.java b/packages/Shell/src/com/android/shell/BugreportReceiver.java
index 7a659ee..02a3aeb 100644
--- a/packages/Shell/src/com/android/shell/BugreportReceiver.java
+++ b/packages/Shell/src/com/android/shell/BugreportReceiver.java
@@ -84,14 +84,17 @@
}
notifIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- final Notification.Builder builder = new Notification.Builder(context);
- builder.setSmallIcon(com.android.internal.R.drawable.stat_sys_adb);
- builder.setContentTitle(context.getString(R.string.bugreport_finished_title));
- builder.setTicker(context.getString(R.string.bugreport_finished_title));
- builder.setContentText(context.getString(R.string.bugreport_finished_text));
- builder.setContentIntent(PendingIntent.getActivity(
- context, 0, notifIntent, PendingIntent.FLAG_CANCEL_CURRENT));
- builder.setAutoCancel(true);
+ final Notification.Builder builder = new Notification.Builder(context)
+ .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
+ .setContentTitle(context.getString(R.string.bugreport_finished_title))
+ .setTicker(context.getString(R.string.bugreport_finished_title))
+ .setContentText(context.getString(R.string.bugreport_finished_text))
+ .setContentIntent(PendingIntent.getActivity(
+ context, 0, notifIntent, PendingIntent.FLAG_CANCEL_CURRENT))
+ .setAutoCancel(true)
+ .setColor(context.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
+
NotificationManager.from(context).notify(TAG, 0, builder.build());
// Clean up older bugreports in background
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index b8836a0..cbea664 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -111,7 +111,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<!-- Screen Capturing -->
- <uses-permission android:name="android.permission.CREATE_MEDIA_PROJECTION" />
+ <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION" />
<application
android:name=".SystemUIApplication"
diff --git a/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_scale.xml b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_scale.xml
new file mode 100644
index 0000000..7c782a6
--- /dev/null
+++ b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_scale.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <objectAnimator
+ android:duration="2016"
+ android:pathData="M 0.1 1 l 0 0 l 0.00882427215576 0 l 0.00982859611511 0
+l 0.01086503982544 0 l 0.01193084716797 0 l 0.0130220413208 0 l 0.01413340568542 0
+l 0.01525821685791 0 l 0.01638801574707 0 l 0.01751272201538 0 l 0.01862035751343 0
+l 0.01969732284546 0 l 0.02072854995728 0 l 0.02169786453247 0 l 0.02258871078491 0
+l 0.02338474273682 0 l 0.02407070159912 0 l 0.02463348388672 0 l 0.0250626373291 0
+l 0.02535140991211 0 l 0.02549694061279 0 l 0.02550048828125 0 l 0.02536708831787 0
+l 0.02510528564453 0 l 0.02472625732422 0 l 0.0242431640625 0 l 0.02367015838623 0
+l 0.02302188873291 0 l 0.02231246948242 0 l 0.02155555725098 0 l 0.02076324462891 0
+l 0.01994682312012 0 l 0.01911575317383 0 l 0.01827827453613 0 l 0.01732414245605 0
+l 0.01522109985352 0 l 0.01262580871582 0 l 0.00973388671875 0 l 0.00647575378418 0
+l 0.0027661895752 0 l -0.00149223327637 0 l -0.00639404296875 0 l -0.01199066162109 0
+l -0.01820671081543 0 l -0.02470901489258 0 l -0.03080444335937 0 l -0.0355574798584 0
+l -0.03823974609375 0 l -0.03876884460449 0 l -0.03766212463379 0 l -0.03562252044678 0
+l -0.03321434020996 0 l -0.03078151702881 0 l -0.02849582672119 0 l -0.02642543792725 0
+l -0.02458423614502 0 l -0.02296115875244 0 l -0.02153518676758 0 l -0.02028285980225 0
+l -0.01918155670166 0 l -0.01821084976196 0 l -0.01735286712646 0 l -0.01659231185913 0
+l -0.01591604232788 0 l -0.0153129196167 0 l -0.01477350234985 0 l -0.01413362503052 0
+l -0.01339265823364 0 l -0.01270362854004 0 l -0.01206108093262 0 l -0.01146033287048 0
+l -0.01089729309082 0 l -0.01036835670471 0 l -0.00987038612366 0 l -0.00940062522888 0
+l -0.00895661354065 0 l -0.00853617668152 0"
+ android:propertyXName="scaleX"
+ android:repeatCount="infinite" />
+
+</set>
\ No newline at end of file
diff --git a/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_translate.xml b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_translate.xml
new file mode 100644
index 0000000..c26bb5d
--- /dev/null
+++ b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect1_translate.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <objectAnimator
+ android:duration="2016"
+ android:pathData="M -522.599975585938 0 l 0 0 l 0.12939453125 0
+l 0.33831787109375 0 l 0.55450439453125 0 l 0.7708740234375 0 l 0.98065185546875 0
+l 1.1964111328125 0 l 1.41351318359375 0 l 1.63153076171875 0 l 1.85052490234375 0
+l 2.07052612304688 0 l 2.29080200195312 0 l 2.51150512695312 0 l 2.73260498046875 0
+l 2.95355224609375 0 l 3.17404174804688 0 l 3.39422607421875 0 l 3.61355590820312 0
+l 3.83163452148438 0 l 4.04849243164062 0 l 4.263671875 0 l 5.74725341796875 0
+l 6.1026611328125 0 l 6.45980834960938 0 l 6.81781005859375 0 l 7.17654418945312 0
+l 7.53366088867188 0 l 7.88861083984375 0 l 8.23974609375 0 l 8.58447265625 0
+l 8.92156982421875 0 l 9.24810791015625 0 l 9.56137084960938 0 l 9.85906982421875 0
+l 10.1377868652344 0 l 10.3955688476562 0 l 10.6287536621094 0 l 10.8357238769531 0
+l 11.0149230957031 0 l 11.1639709472656 0 l 11.2832336425781 0 l 11.3713989257812 0
+l 11.4301147460938 0 l 11.4596557617188 0 l 11.4611053466797 0 l 11.4369049072266 0
+l 11.3887786865234 0 l 11.3183441162109 0 l 11.2276000976562 0 l 11.1185607910156 0
+l 10.9933776855469 0 l 10.8534698486328 0 l 10.6995391845703 0 l 10.533935546875 0
+l 10.3744659423828 0 l 10.3707733154297 0 l 10.4309463500977 0 l 10.5275726318359 0
+l 10.671501159668 0 l 10.8763961791992 0 l 11.1566543579102 0 l 11.5270767211914 0
+l 11.9947967529297 0 l 12.5502433776855 0 l 13.1453399658203 0 l 13.680793762207 0
+l 14.0223298072815 0 l 14.0650296211243 0 l 13.798041343689 0 l 13.2949924468994 0
+l 12.6584892272949 0 l 11.9693031311035 0 l 11.2772979736328 0 l 10.607666015625 0
+l 9.97052764892578 0 l 9.36723327636719 0 l 8.79751586914062 0 l 8.25792694091797 0
+l 7.74495697021484 0 l 7.25632476806641 0 l 6.78855895996094 0 l 6.33934020996094 0
+l 5.9071044921875 0 l 5.48941040039062 0 l 5.08502197265625 0 l 4.69291687011719 0
+l 4.33430480957031 0 l 4.00733947753906 0 l 3.68829345703125 0 l 3.37684631347656 0
+l 3.07246398925781 0 l 2.77439880371094 0 l 2.48252868652344 0 l 2.20101928710938 0
+l 1.91748046875 0 l 1.63726806640625 0 l 1.36772155761719 0"
+ android:propertyXName="translateX"
+ android:repeatCount="infinite" />
+
+</set>
\ No newline at end of file
diff --git a/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_scale.xml b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_scale.xml
new file mode 100644
index 0000000..ef1677d
--- /dev/null
+++ b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_scale.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <objectAnimator
+ android:duration="2016"
+ android:pathData="M 0.1 1 l 0.00930031776428 0 l 0.01123028755188 0
+l 0.01313143730164 0 l 0.01497107505798 0 l 0.01671510696411 0 l 0.01833034515381 0
+l 0.01978672027588 0 l 0.02105976104736 0 l 0.02213228225708 0 l 0.02299520492554 0
+l 0.02364795684814 0 l 0.02409727096558 0 l 0.02435619354248 0 l 0.02444213867188 0
+l 0.02437515258789 0 l 0.02417644500732 0 l 0.02386695861816 0 l 0.02346652984619 0
+l 0.02299335479736 0 l 0.0224634552002 0 l 0.02189086914062 0 l 0.02128746032715 0
+l 0.02066318511963 0 l 0.02002624511719 0 l 0.01938335418701 0 l 0.01873977661133 0
+l 0.01809989929199 0 l 0.01746696472168 0 l 0.01684349060059 0 l 0.01623161315918 0
+l 0.0156324005127 0 l 0.0150471496582 0 l 0.01447631835938 0 l 0.01392051696777 0
+l 0.01337966918945 0 l 0.0128540802002 0 l 0.01234344482422 0 l 0.01184753417969 0
+l 0.0113663482666 0 l 0.01089920043945 0 l 0.01044593811035 0 l 0.00998542785645 0
+l 0.00933837890625 0 l 0.00863349914551 0 l 0.00791206359863 0 l 0.00717010498047 0
+l 0.00640274047852 0 l 0.00560478210449 0 l 0.00477012634277 0 l 0.00389221191406 0
+l 0.00296325683594 0 l 0.0019751739502 0 l 0.00091903686523 0 l -0.00021408081055 0
+l -0.00143287658691 0 l -0.00274444580078 0 l -0.00415267944336 0 l -0.00565589904785 0
+l -0.00724327087402 0 l -0.00889205932617 0 l -0.01056480407715 0 l -0.01220878601074 0
+l -0.01376045227051 0 l -0.01515449523926 0 l -0.01633560180664 0 l -0.01726905822754 0
+l -0.01794639587402 0 l -0.0183829498291 0 l -0.01861137390137 0 l -0.01867179870605 0
+l -0.01860504150391 0 l -0.01844764709473 0 l -0.01822959899902 0 l -0.01797431945801 0
+l -0.0176993560791 0 l -0.0174169921875 0 l -0.01713603973389 0 l -0.01686214447021 0
+l -0.01651359558105 0 l -0.01609485626221 0 l -0.01569358825684 0 l -0.01531024932861 0
+l -0.0149446105957 0 l -0.01459632873535 0 l -0.01426464080811 0 l -0.0139489364624 0
+l -0.01364833831787 0 l -0.01336200714111 0 l -0.01308917999268 0 l -0.01282897949219 0
+l -0.01258075714111 0 l -0.01234363555908 0 l -0.01211700439453 0 l -0.01190029144287 0
+l -0.01169273376465 0 l -0.01149394989014 0 l -0.01130325317383 0 l -0.01112024307251 0
+l -0.01094444274902 0 l -0.01077545166016 0 l -0.0106128692627 0 l -0.01045631408691 0
+l -0.01030544281006 0 l -0.01016000747681 0 l -0.01001962661743 0 l -0.0098840713501 0
+l -0.00975311279297 0 l -0.00962644577026 0 l -0.00950393676758 0 l -0.00938529968262 0
+l -0.00927038192749 0 l -0.00915899276733 0 l -0.00905097961426 0 l -0.00894614219666 0
+l -0.00884438514709 0 l -0.00874552726746 0 l -0.00864946365356 0 l -0.00855606079102 0
+l -0.00846519470215 0 l -0.00837676048279 0 "
+ android:propertyXName="scaleX"
+ android:repeatCount="infinite" />
+
+</set>
\ No newline at end of file
diff --git a/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_translate.xml b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_translate.xml
new file mode 100644
index 0000000..f4cf83d
--- /dev/null
+++ b/packages/SystemUI/res/anim/progress_indeterminate_horizontal_rect2_translate.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <objectAnimator
+ android:duration="2016"
+ android:pathData="M -197.600006103516 0 l 1.42625427246094 0
+l 1.80754089355469 0 l 2.18778991699219 0 l 2.56109619140625 0 l 2.91810607910156 0
+l 3.25482177734375 0 l 3.57159423828125 0 l 3.862548828125 0 l 4.12493896484375 0
+l 4.35758972167969 0 l 4.56034851074219 0 l 4.73426818847656 0 l 4.88090515136719 0
+l 5.00271606445312 0 l 5.10273742675781 0 l 5.18400573730469 0 l 5.24911499023438 0
+l 5.30097961425781 0 l 5.34226226806641 0 l 5.37535095214844 0 l 5.40180206298828 0
+l 5.42322540283203 0 l 5.44123077392578 0 l 5.45704650878906 0 l 5.47099304199219 0
+l 5.48395538330078 0 l 5.4967041015625 0 l 5.50949859619141 0 l 5.52214813232422 0
+l 5.53528594970703 0 l 5.54912567138672 0 l 5.56306457519531 0 l 5.57742691040039 0
+l 5.59244155883789 0 l 5.60744094848633 0 l 5.62243270874023 0 l 5.6376781463623 0
+l 5.65262794494629 0 l 5.66689777374268 0 l 5.68069934844971 0 l 5.69401162862778 0
+l 5.70898681879044 0 l 5.75169992446899 0 l 5.80327129364014 0 l 5.85710144042969 0
+l 5.91399765014648 0 l 5.97450065612793 0 l 6.03849411010742 0 l 6.10729217529297 0
+l 6.18125534057617 0 l 6.26116561889648 0 l 6.34840393066406 0 l 6.44406127929688 0
+l 6.54866790771484 0 l 6.66371917724609 0 l 6.79020690917969 0 l 6.92859649658203 0
+l 7.07807159423828 0 l 7.23712158203125 0 l 7.40253448486328 0 l 7.56884765625 0
+l 7.72840881347656 0 l 7.87199401855469 0 l 7.98992919921875 0 l 8.07417297363281 0
+l 8.12013244628906 0 l 8.12655639648438 0 l 8.09510803222656 0 l 8.03091430664062 0
+l 7.93995666503906 0 l 7.827880859375 0 l 7.69976806640625 0 l 7.56065368652344 0
+l 7.41322326660156 0 l 7.26063537597656 0 l 7.10470581054688 0 l 6.94624328613281 0
+l 6.78694152832031 0 l 6.6390380859375 0 l 6.50302124023438 0 l 6.36688232421875 0
+l 6.23043823242188 0 l 6.09356689453125 0 l 5.95706176757812 0 l 5.82064819335938 0
+l 5.6839599609375 0 l 5.5477294921875 0 l 5.41143798828125 0 l 5.27532958984375 0
+l 5.13922119140625 0 l 5.00347900390625 0 l 4.8680419921875 0 l 4.73251342773438 0
+l 4.59732055664062 0 l 4.46258544921875 0 l 4.328125 0 l 4.1937255859375 0
+l 4.0599365234375 0 l 3.92672729492188 0 l 3.79376220703125 0 l 3.66119384765625 0
+l 3.52935791015625 0 l 3.398193359375 0 l 3.26748657226562 0 l 3.13726806640625 0
+l 3.00796508789062 0 l 2.87939453125 0 l 2.7515869140625 0 l 2.62445068359375 0
+l 2.49810791015625 0 l 2.3726806640625 0 l 2.2481689453125 0 l 2.12457275390625 0
+l 2.00173950195312 0 l 1.87997436523438 0 l 1.7618408203125 0 l 1.64154052734375 0
+l 1.51962280273438 0 l 1.40017700195312 0 l 1.28421020507812 0 "
+ android:propertyXName="translateX"
+ android:repeatCount="infinite" />
+
+</set>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
index b28624f..5be74ec 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png
index 9ce434d..305c9fb 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
index 51dce69..3e676ab 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
index 3f3e288..d3e1f7a 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
index 9856cbf..d632600 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
index 6910456..8984a49d 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
index e8c6ec6..2e8f8f0 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
index 06dcd20..ec499d4 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
index 240f536..13e8a4f 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png
index e464347..c697da7 100644
--- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png
index f8b59e8..94404df 100644
--- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png
index 1b578a6..9d0014d 100644
--- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png
index 80ecaba..9a8b0e9 100644
--- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png
index c7bf2c7..80d60af 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png
index 278de42..2dfe964 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png
index 464831c..fd1cc27 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png
index c24132c..183aa0d 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png
index bc84f22..6f763a4 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png
index f4e219e..3dc75a3 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png
index ece2e37..83040fd 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png
index d524dcf..9917be4 100644
--- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png
index 373e84a..c116bbe 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png
index e5a102a..1446850 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png
index 6b19593..83040fd 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png
index a5e0686..9917be4 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
index f878093..447c655 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png
index 7780b16..d5ca622 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
index 343d0dd..47985de 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png
index 8e9583b..7b5fe8b 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
index 7d38703..9fcb705 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png
index 6e186a3..23c24ba 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
index 12b4042..41c1acb 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png
index e2a89c3..11a92f0 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
index 311720b..7fb14a8 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png
index 67e4ee7..eaac305 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png
index dfef430..b5d3739 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png
index de6d109..9915260 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png
index 7d0c3fbe..4a349e2 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png
index 3baeb52..d14da80 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png
index d5b48e8..4f5e723 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png
index 26d7e7b..05b9b44 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png
index c49198d..2035323 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png
index 2a21f29..69b541b 100644
--- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png
index 538d7d1..3f2b8b4 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png
index eb8e80b..23e5e8f 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png
index 1c2c35a..4b7f3ac 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png
index eec613f..41054f6 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png
index 1c0bad8..e4a7181 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png
index 1293fa8..be678e0 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png
index 96a9cce..24d37e0 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png
index 9ffc80a..9443656 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png
index aa9b57b..c3c64f4 100644
--- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png
index b343522..0ab43ce 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png
index f2f7b50..3c58211 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png
index 383398c..14ff6d3 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png
index 53444ab..eb74d0d 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png
index 4294937..e29c9d0 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png
index 7cb3ee4..cfecdcf 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png
index b017946..d98208a 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png
index e8dd07c..71cc61b 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png
index f396ea9..bdecf06 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png
index 1b817cf..01edd86 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png
index 21b7a06..52bd6e8 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png
index 676fc14..b0dd0f0 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png
index 26f4ba9..b5c189d 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png
index ea21b60..42e9e31 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png
index c7d77c2..669d8ba 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png
index ae12cfd..0fbf1f6 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png
index 8c27d45..023b94c 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png
index c98827c..5884492 100644
--- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
index ec2951d..4956aad 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png
index 5103190..e9a6223 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
index 818aa4f..e9767a1 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
index 254f757..acaf32d 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
index f0de417..20cb101 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
index 97f1526..cc620a2 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
index 773fa94..aa8a60e 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
index 8a8e941..88d6a41 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
index ad7dfc3..8acdd3c 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png
index 77969b8..01edd86 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png
index b171f92..52bd6e8 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png
index ad35c65..b0dd0f0 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png
index d60229f..b5c189d 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png
index 8fffa8e..42e9e31 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png
index 9215055..669d8ba 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png
index bcf7eb1..0fbf1f6 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png
index a261f85..023b94c 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png
index 4c612f7..5884492 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
deleted file mode 100644
index 0df1a96..0000000
--- a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="64dp"
- android:height="64dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
-
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M20.0,8.0l-2.8,0.0c-0.5,-0.8 -1.1,-1.5 -1.8,-2.0L17.0,4.4L15.6,3.0l-2.2,2.2C13.0,5.1 12.5,5.0 12.0,5.0s-1.0,0.1 -1.4,0.2L8.4,3.0L7.0,4.4L8.6,6.0C7.9,6.5 7.3,7.2 6.8,8.0L4.0,8.0l0.0,2.0l2.1,0.0C6.0,10.3 6.0,10.7 6.0,11.0l0.0,1.0L4.0,12.0l0.0,2.0l2.0,0.0l0.0,1.0c0.0,0.3 0.0,0.7 0.1,1.0L4.0,16.0l0.0,2.0l2.8,0.0c1.0,1.8 3.0,3.0 5.2,3.0s4.2,-1.2 5.2,-3.0L20.0,18.0l0.0,-2.0l-2.1,0.0c0.1,-0.3 0.1,-0.7 0.1,-1.0l0.0,-1.0l2.0,0.0l0.0,-2.0l-2.0,0.0l0.0,-1.0c0.0,-0.3 0.0,-0.7 -0.1,-1.0L20.0,10.0L20.0,8.0zM14.0,16.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,16.0zM14.0,12.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,12.0z"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/indeterminate.xml b/packages/SystemUI/res/drawable/indeterminate.xml
new file mode 100644
index 0000000..35e11e5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/indeterminate.xml
@@ -0,0 +1,45 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="2dp"
+ android:viewportHeight="1"
+ android:viewportWidth="360"
+ android:width="360dp" >
+
+ <group
+ android:name="linear_indeterminate"
+ android:translateX="180.0"
+ android:translateY="0.0" >
+ <group
+ android:name="path1"
+ android:scaleX="0.1"
+ android:translateX="-522.59" >
+ <path
+ android:name="rect1"
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="m 0 0 l 288 0 l 0 1 l -288 0 z" />
+ </group>
+ <group
+ android:name="path2"
+ android:scaleX="0.1"
+ android:translateX="-197.6" >
+ <path
+ android:name="rect2"
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="m 0 0 l 288 0 l 0 1 l -288 0 z" />
+ </group>
+ </group>
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/indeterminate_anim.xml b/packages/SystemUI/res/drawable/indeterminate_anim.xml
new file mode 100644
index 0000000..13b1ccf
--- /dev/null
+++ b/packages/SystemUI/res/drawable/indeterminate_anim.xml
@@ -0,0 +1,32 @@
+<!--
+ 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/indeterminate" >
+
+ <target
+ android:name="path1"
+ android:animation="@anim/progress_indeterminate_horizontal_rect1_translate" />
+ <target
+ android:name="path1"
+ android:animation="@anim/progress_indeterminate_horizontal_rect1_scale" />
+
+ <target
+ android:name="path2"
+ android:animation="@anim/progress_indeterminate_horizontal_rect2_translate" />
+ <target
+ android:name="path2"
+ android:animation="@anim/progress_indeterminate_horizontal_rect2_scale" />
+</animated-vector>
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index fc6e9ae..8e9b501 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -27,7 +27,7 @@
android:id="@+id/keyguard_indication_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="70dp"
+ android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
android:layout_gravity="bottom|center_horizontal"
android:textStyle="italic"
android:textColor="#ffffff"
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index d4b1214..faa2820 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -60,7 +60,8 @@
android:paddingEnd="@dimen/battery_level_padding_end"
android:textColor="#ffffff"
android:visibility="gone"
- android:textSize="12sp"/>
+ android:textSize="@dimen/battery_level_text_size"
+ android:importantForAccessibility="noHideDescendants"/>
</LinearLayout>
<com.android.keyguard.CarrierText
diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml
index fcbb32c..f3f1918 100644
--- a/packages/SystemUI/res/layout/qs_detail_header.xml
+++ b/packages/SystemUI/res/layout/qs_detail_header.xml
@@ -15,7 +15,10 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/BrightnessDialogContainer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:padding="@dimen/qs_panel_padding"
android:background="@drawable/btn_borderless_rect" >
<TextView
diff --git a/packages/SystemUI/res/layout/recents_task_view.xml b/packages/SystemUI/res/layout/recents_task_view.xml
index 6cfff2e3..5253ee0 100644
--- a/packages/SystemUI/res/layout/recents_task_view.xml
+++ b/packages/SystemUI/res/layout/recents_task_view.xml
@@ -17,7 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:focusable="true">
+ android:focusable="true"
+ android:background="#FFffffff">
<com.android.systemui.recents.views.TaskViewThumbnail
android:id="@+id/task_view_thumbnail"
android:layout_width="match_parent"
@@ -68,6 +69,7 @@
android:layout_gravity="bottom|right"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
+ android:translationZ="3dp"
android:contentDescription="@string/recents_lock_to_app_button_label"
android:background="@drawable/recents_lock_to_task_button_bg">
<ImageView
diff --git a/packages/SystemUI/res/layout/split_clock_view.xml b/packages/SystemUI/res/layout/split_clock_view.xml
index d9ba35d..87b7051 100644
--- a/packages/SystemUI/res/layout/split_clock_view.xml
+++ b/packages/SystemUI/res/layout/split_clock_view.xml
@@ -34,5 +34,15 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
+ android:textSize="@dimen/qs_time_collapsed_size"
+ />
+
+ <!-- Empty text view so we have the same height when expanded/collapsed-->
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="invisible"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
/>
</com.android.systemui.statusbar.policy.SplitClockView>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 4eab9c7..cc449c5 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -50,6 +50,10 @@
android:visibility="gone"
/>
+ <include
+ layout="@layout/keyguard_bottom_area"
+ android:visibility="gone" />
+
<com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -115,10 +119,6 @@
<include layout="@layout/status_bar_expanded_header" />
- <include
- layout="@layout/keyguard_bottom_area"
- android:visibility="gone" />
-
<com.android.systemui.statusbar.AlphaOptimizedView
android:id="@+id/qs_navbar_scrim"
android:layout_height="96dp"
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index 21d8457..aa276bc 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -51,7 +51,7 @@
android:layout_height="@dimen/status_bar_header_height"
android:background="@drawable/ripple_drawable"
android:src="@drawable/ic_settings"
- android:contentDescription="@string/accessibility_desc_quick_settings"/>
+ android:contentDescription="@string/accessibility_desc_settings"/>
<LinearLayout android:id="@+id/system_icons_super_container"
android:layout_width="wrap_content"
@@ -72,7 +72,8 @@
android:layout_marginStart="@dimen/header_battery_margin_expanded"
android:paddingEnd="@dimen/battery_level_padding_end"
android:textColor="#ffffff"
- android:textSize="12sp"/>
+ android:textSize="@dimen/battery_level_text_size"
+ android:importantForAccessibility="noHideDescendants"/>
</LinearLayout>
<TextView
@@ -148,6 +149,16 @@
android:layout_alignParentBottom="true"
/>
+ <ImageView
+ android:id="@+id/qs_detail_header_progress"
+ android:src="@drawable/indeterminate_anim"
+ android:alpha="0"
+ android:background="@color/qs_detail_progress_track"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ />
+
<TextView
android:id="@+id/header_debug_info"
android:visibility="invisible"
diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
index 062e6cb..a5bf68e 100644
--- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
+++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
@@ -45,6 +45,7 @@
android:paddingBottom="16dp"
android:thumb="@drawable/ic_brightness_thumb"
android:splitTrack="false"
+ android:contentDescription="@string/accessibility_brightness"
/>
<TextView
android:id="@+id/label"
diff --git a/packages/SystemUI/res/layout/volume_panel.xml b/packages/SystemUI/res/layout/volume_panel.xml
index c85a750..4d8aaa7 100644
--- a/packages/SystemUI/res/layout/volume_panel.xml
+++ b/packages/SystemUI/res/layout/volume_panel.xml
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/system_secondary_color"
- android:paddingTop="12dp"
+ android:paddingTop="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:clipChildren="false" />
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index 9d5f7bd..3949d7d 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -35,8 +35,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/qs_panel_padding"
android:layout_marginRight="@dimen/qs_panel_padding"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="4dp"
+ android:layout_marginBottom="8dp"
android:clipChildren="false" />
</FrameLayout>
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index 55ad0bc..a514324 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Maak skoon"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Verwyder uit lys"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Program Info"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Geen onlangse programme nie"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Maak onlangse programme toe"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 onlangse program"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Terug"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Tuis"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Kieslys"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Onlangse programme"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Deursoek"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Foon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Kennisgewing is toegemaak."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Kennisgewingskerm."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Vinnige instellings."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Onlangse programme."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Instellings"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Gebruiker <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobiele <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Maak paneel toe"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Meer tyd"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Minder tyd"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G-data is af"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-data is af"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Sellulêre data is af"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> gebruik"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g>-limiet"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> waarskuwing"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Geen onlangse programme nie"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Programinligting"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"sluit na program"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Jy sal nie jou wekker om <xliff:g id="ALARM_TIME">%s</xliff:g> hoor nie"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Minder dringende kennisgewings hieronder"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tik weer om oop te maak"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Sleep op om te ontsluit"</string>
<string name="phone_hint" msgid="3101468054914424646">"Sleep regs vir foon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Sleep links vir kamera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioriteit"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alles"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Laai tans (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> tot vol)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Voeg gebruiker by"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nuwe gebruiker"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gas"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ gas"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Laat gas uitgaan"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Verwyder gas"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Verlaat gassessie?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"As die gassessie verlaat word, sal plaaslike data verwyder word."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Welkom terug, gas!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Wil jy \'n nuwe sessie begin?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nee, dankie"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Een minuut lank"</item>
<item quantity="other" msgid="6924190729213550991">"%d minute lank"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Jy is aan \'n VPN gekoppel (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nJou VPN-diensverskaffer kan jou toestel en netwerkaktiwiteit monitor, insluitend e-posse, programme en veilige webwerwe."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Hierdie toestel word bestuur deur:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJou administrateur kan jou netwerkaktiwiteit monitor, insluitend e-posse, programme en veilige webwerwe. Kontak jou administrateur vir meer inligting.\n\nJy het ook \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" toestemming gegee om \'n VPN-verbinding op te stel. Die program kan ook jou netwerkaktiwiteit monitor."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Hierdie toestel word bestuur deur:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJou administrateur is in staat om jou netwerkaktiwiteit te monitor, insluitend e-posse, programme en veilige webwerwe. Kontak jou administrateur vir meer inligting.\n\nJy is ook aan \'n VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") gekoppel. Jou VPN-diensverskaffer kan ook jou netwerkaktiwiteit monitor."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 3bbe021..bbc6613 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"አጽዳ"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ከዝርዝር አስወግድ"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"የትግበራ መረጃ"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ምንም የቅርብ ጊዜ ትግበራዎች የሉም"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"የቅርብ ጊዜ መተግበሪያዎችን ሰርዝ"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 የቅርብ ጊዜ መተግበሪያ"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"ተመለስ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"መነሻ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"ምናሌ"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"የቅርብ ጊዜ መተግበሪያዎች"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ፈልግ"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ካሜራ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ስልክ"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"ማሳወቂያ ተወግዷል።"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"የማሳወቂያ ጥላ።"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ፈጣን ቅንብሮች።"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"የቅርብ ጊዜ መተግበሪያዎች።"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ቅንብሮች"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ተጠቃሚ <xliff:g id="USER">%s</xliff:g>።"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>። <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"ተንቀሳቃሽ ስልክ <xliff:g id="SIGNAL">%1$s</xliff:g>። <xliff:g id="TYPE">%2$s</xliff:g>። <xliff:g id="NETWORK">%3$s</xliff:g>።"</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ፓነል ዝጋ"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"ተጨማሪ ጊዜ"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"ያነሰ ጊዜ"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2ጂ-3ጂ ውሂብ ጠፍቷል"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4ጂ ውሂብ ጠፍቷል"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"የተንቀሳቃሽ ስልክ ውሂብ ጠፍቷል"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ጥቅም ላይ ውሏል"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ገደብ"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"የ<xliff:g id="DATA_LIMIT">%s</xliff:g> ማስጠንቀቂያ"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ምንም የቅርብ ጊዜ መተግበሪያዎች የሉም"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"የመተግበሪያ መረጃ"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"መተግበሪያ-ጋር-ቆልፍ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ፈልግ"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"በ<xliff:g id="ALARM_TIME">%s</xliff:g> ያለውን ማንቂያ ደውልዎን አይሰሙትም"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"በጣም አስቸካይ ያልሆኑ ማሳወቂያዎች ከታች"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"ለመክፈት ዳግም መታ ያድርጉ"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"ለማስከፈት ወደ ላይ ያንሸራትቱ"</string>
<string name="phone_hint" msgid="3101468054914424646">"ለስልክ ወደቀኝ ያንሸራትቱ"</string>
<string name="camera_hint" msgid="5241441720959174226">"ለካሜራ ወደግራ ያንሸራትቱ"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ቅድሚያ"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ሁሉም"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ሃይል በመሙላት ላይ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> እስከሚሞላ ድረስ)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"ተጠቃሚ አክል"</string>
<string name="user_new_user_name" msgid="426540612051178753">"አዲስ ተጠቃሚ"</string>
<string name="guest_nickname" msgid="8059989128963789678">"እንግዳ"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ እንግዳ"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"እንግዳ ያስወጡ"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"እንግዳ አስወግድ"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ከእንግዳ ክፍለ ጊዜው እየወጡ ነው?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ከእንግዳ ክፍለ-ጊዜ መውጣት አካባቢያዊ ውሂብ ያስወግዳል።"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"እንኳን በደህና ተመለሱ እንግዳ!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"አዲስ ክፍለ-ጊዜ መጀመር ይፈልጋሉ?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"አዎ"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"አይ፣ አመሰግናለሁ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ለአንድ ደቂቃ"</item>
<item quantity="other" msgid="6924190729213550991">"ለ%d ደቂቃዎች"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"ከአንድ VPN («<xliff:g id="APPLICATION">%1$s</xliff:g>») ጋር ተገናኝተዋል።\n\nየእርስዎ VPN አገልግሎት አቅራቢ መሣሪያዎን እና ኢሜይሎችን፣ መተግበሪያዎችን እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችን ጨምሮ የአውታረ መረብ እንቅስቃሴዎን መከታተል ይችላል።"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ይህ መሣሪያ የሚተዳደረው በ፦\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nየእርስዎ አስተዳዳሪ ኢሜይሎችን፣ መተግበሪያዎችን እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችን ጨምሮ የአውታረ መረብ እንቅስቃሴዎን መከታተል ይችላል። ተጨማሪ መረጃ ለማግኘት አስተዳዳሪዎን ያነጋግሩ።\n\nእንዲሁም፣ «<xliff:g id="APPLICATION">%2$s</xliff:g>» አንድ የVPN ግንኙነት እንዲያዋቅር ፍቃድ ሰጥተዋቸዋል። ይህ መተግበሪያም የአውታረ መረብ እንቅስቃሴ መከታተል ይችላል።"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ይህ መሣሪያ የሚተዳደረው በ፦\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nየእርስዎ አስተዳዳሪ ኢሜይሎችን፣ መተግበሪያዎችን እና ደህንነታቸው የተጠበቁ ድር ጣቢያዎችን ጨምሮ የአውታረ መረብ እንቅስቃሴዎን መከታተል ይችላል። ተጨማሪ መረጃ ለማግኘት አስተዳዳሪዎን ያነጋግሩ።\n\nእንዲሁም ከአንድ VPN («<xliff:g id="APPLICATION">%2$s</xliff:g>») ጋር ተገናኝተዋል። የእርስዎ የVPN አገልግሎት አቅራቢዎም የአውታረ መረብ እንቅስቃሴ መከታተል ይችላል።"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 03b18bb..468867c 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"محو"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"إزالة من القائمة"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"معلومات التطبيق"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ليس هناك تطبيقات حديثة"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"إزالة التطبيقات الحديثة"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"تطبيق حديث واحد"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"رجوع"</string>
<string name="accessibility_home" msgid="8217216074895377641">"الرئيسية"</string>
<string name="accessibility_menu" msgid="316839303324695949">"القائمة"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"التطبيقات الحديثة"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"بحث"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"الكاميرا"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"الهاتف"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"تم تجاهل الإشعار."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"مركز الإشعارات."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"الإعدادات السريعة."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"التطبيقات الحديثة"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"الإعدادات"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"المستخدم <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"الجوال <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"إغلاق اللوحة"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"وقت أكثر"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"وقت أقل"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2-3 غيغابايت من البيانات المعطلة"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4 غيغابايت من البيانات المعطلة"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"البيانات الخلوية معطلة"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> مستخدم"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"قيد <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"تحذير <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ليست هناك تطبيقات حديثة"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"معلومات التطبيق"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"تقييد بالتطبيق"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"بحث"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"لن تسمع المنبهات في <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"الإشعارات الأقل إلحاحًا أدناه"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"انقر مرة أخرى للفتح"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"مرر سريعًا لأعلى لإلغاء القفل"</string>
<string name="phone_hint" msgid="3101468054914424646">"مرر سريعًا إلى اليسار لفتح الهاتف"</string>
<string name="camera_hint" msgid="5241441720959174226">"مرر سريعًا إلى اليمين لفتح الكاميرا"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"الأولوية"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"الكل"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"جارٍ الشحن (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> حتى الامتلاء)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"إضافة مستخدم"</string>
<string name="user_new_user_name" msgid="426540612051178753">"مستخدم جديد"</string>
<string name="guest_nickname" msgid="8059989128963789678">"المدعو"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ مدعو"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"الخروج من وضع الضيف"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"إزالة جلسة الضيف"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"هل تريد الخروج من جلسة الضيف؟"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"سيؤدي الخروج من جلسة الضيف إلى إزالة البيانات المحلية."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"مرحبًا بك مجددًا في جلسة الضيف"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"هل تريد بدء جلسة جديدة؟"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"نعم"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"لا، شكرًا"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"لمدة دقيقة واحدة"</item>
<item quantity="other" msgid="6924190729213550991">"لمدة %d من الدقائق"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"أنت متصل بشبكة ظاهرية خاصة (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nيمكن لموفر خدمة الشبكة الظاهرية الخاصة مراقبة جهازك ونشاط الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"هذا الجهاز تتم إدارته بواسطة:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nيمكن للمشرف مراقبة نشاط الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة. للحصول على مزيد من المعلومات اتصل بالمشرف.\n\nوكذلك، فإنك منحت \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" إذنًا لإعداد الاتصال بالشبكة الظاهرية الخاصة. ويمكن لهذا التطبيق مراقبة نشاط الشبكة أيضًا."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"هذا الجهاز تتم إدارته بواسطة:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nيمكن للمشرف مراقبة نشاط الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب الآمنة. للحصول على مزيد من المعلومات اتصل بالمشرف.\n\nوكذلك، فإنك متصل بالشبكة الظاهرية الخاصة (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). ويمكن لمزوّد خدمة الشبكة الظاهرية الخاصة مراقبة نشاط الشبكة أيضًا."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index 4790c87..4022c80 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Изчистване"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Премахване от списъка"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Информация за приложението"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Няма скорошни приложения"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Отхвърляне на скорошните приложения"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 скорошно приложение"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Назад"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Начало"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Меню"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Скорошни приложения"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Търсене"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Известието е отхвърлено."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Падащ панел с известия."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Бързи настройки."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Скорошни приложения."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Настройки"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Потребител: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобилно устройство: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Затваряне на панела"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Повече време"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"По-малко време"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Данните от 2G – 3G са изключени"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Данните от 4G са изключени"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Мобилните данни са изключени"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Използвано: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение от <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Няма скорошни приложения"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информация за приложението"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"заключване в приложението"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"търсене"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Няма да чуете будилника си в <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Ппоказване на по-малко спешните известия по-долу"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Докоснете отново, за да отворите"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Прекарайте пръст нагоре, за да отключите"</string>
<string name="phone_hint" msgid="3101468054914424646">"Прекарайте пръст надясно, за да използвате телефона"</string>
<string name="camera_hint" msgid="5241441720959174226">"Прекарайте пръст наляво, за да включите камерата"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Приоритет"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Всички"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Зарежда се (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до пълно зареждане)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Добавяне на потребител"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Нов потребител"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Гост"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ гост"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Изход от сесията като гост"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Премахване на госта"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Да се излезе ли от сесията като гост?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Излизането от сесията като гост ще премахне локалните данни."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Добре дошли отново в сесията като гост!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Искате ли да започнете нова сесия?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Да"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Не, благодаря"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"За една минута"</item>
<item quantity="other" msgid="6924190729213550991">"За %d минути"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Свързани сте с виртуална частна мрежа („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nДоставчикът ви на услуги за VPN може да наблюдава устройството ви и активността ви в мрежата, включително имейлите, приложенията и защитените уебсайтове."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"У-вото се управлява от:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистраторът ви може да наблюдава активн. ви в мрежата, вкл. имейлите, прилож. и защитените уебсайтове. За повече информация се свържете с него.\n\nСъщо така дадохте на „<xliff:g id="APPLICATION">%2$s</xliff:g>“ разрешение да настрои връзка с вирт. частна мрежа (VPN). Прилож. може да наблюдава и активн. в мрежата."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"У-вото се управлява от:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистраторът ви може да наблюдава активн. ви в мрежата, вкл. имейлите, прилож. и защитените уебсайтове. За повече информация се свържете с него.\n\nСъщо така сте свързани с вирт. частна мрежа (VPN) („<xliff:g id="APPLICATION">%2$s</xliff:g>“). Доставчикът ви на услуги за VPN може да наблюдава и активн. ви в мрежата."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml
index 46e5a28..12970bb 100644
--- a/packages/SystemUI/res/values-bn-rBD/strings.xml
+++ b/packages/SystemUI/res/values-bn-rBD/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"সাফ করুন"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"তালিকা থেকে সরান"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"অ্যাপ্লিকেশানের তথ্য"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"কোনো সাম্প্রতিক অ্যাপ্লিকেশান নেই"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"সাম্প্রতিক অ্যাপ্লিকেশানগুলি খারিজ করুন"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"১টি সাম্প্রতিক অ্যাপ্লিকেশান"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"ফিরুন"</string>
<string name="accessibility_home" msgid="8217216074895377641">"হোম"</string>
<string name="accessibility_menu" msgid="316839303324695949">"মেনু"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"সাম্প্রতিক অ্যাপ্লিকেশানগুলি"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"অনুসন্ধান করুন"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ক্যামেরা"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ফোন"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"বিজ্ঞপ্তি খারিজ করা হয়েছে৷"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"বিজ্ঞপ্তি শেড৷"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"দ্রুত সেটিংস৷"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"সাম্প্রতিক অ্যাপ্লিকেশানগুলি৷"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"সেটিংস"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ব্যবহারকারী <xliff:g id="USER">%s</xliff:g>৷"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>৷ <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"মোবাইল <xliff:g id="SIGNAL">%1$s</xliff:g>৷ <xliff:g id="TYPE">%2$s</xliff:g>৷ <xliff:g id="NETWORK">%3$s</xliff:g>৷"</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"প্যানেল বন্ধ করুন"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"বেশি সময়"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"কম সময়"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G ডেটা বন্ধ"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G ডেটা বন্ধ"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"সেলুলার ডেটা বন্ধ"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ব্যবহৃত হয়েছে"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"সীমা <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> সতর্কতা"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"কোনো সাম্প্রতিক অ্যাপ্লিকেশান নেই"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"অ্যাপ্লিকেশানের তথ্য"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"অ্যাপ্লিকেশানে লক করুন"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"অনুসন্ধান"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> বাজলে আপনি অ্যালার্ম শুনতে পাবেন না"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"নিচে অপেক্ষাকৃত কম জরুরী বিজ্ঞপ্তিগুলি"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"খোলার জন্য আবার আলতো চাপুন"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"আনলক করতে উপরের দিকে সোয়াইপ করুন"</string>
<string name="phone_hint" msgid="3101468054914424646">"ফোনের জন্য ডানদিকে সোয়াইপ করুন"</string>
<string name="camera_hint" msgid="5241441720959174226">"ক্যামেরার জন্য ডানদিকে সোয়াইপ করুন"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"অগ্রাধিকার"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"সমস্ত"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"চার্জ হচ্ছে (পূর্ণ হতে <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> সময় বাকি)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"ব্যবহারকারী জুড়ুন"</string>
<string name="user_new_user_name" msgid="426540612051178753">"নতুন ব্যবহারকারী"</string>
<string name="guest_nickname" msgid="8059989128963789678">"অতিথি"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ অতিথি"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"অতিথির প্রস্থান"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"অতিথি সরান"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"অতিথি সেশন ত্যাগ করছেন?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"অতিথি সেশন থেকে প্রস্থান করা হলে স্থানীয় ডেটা মুছে যাবে।"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"অতিথি, আপনি ফিরে আসায় আপনাকে স্বাগত!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"আপনি কি একটি নতুন সেশন শুরু করতে চান?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"হ্যাঁ"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"না, থাক"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"এক মিনিটের জন্য"</item>
<item quantity="other" msgid="6924190729213550991">"%d মিনিটের জন্য"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"আপনি একটি VPN (“<xliff:g id="APPLICATION">%1$s</xliff:g>”) এর সঙ্গে সংযুক্ত আছেন।\n\nআপনার VPN পরিষেবা প্রদানকারী ইমেল, অ্যাপ্লিকেশান ও নিরাপদ ওয়েবসাইটগুলি সহ আপনার নেটওয়ার্ক ক্রিয়াকলাপ নিরীক্ষণ করতে পারেন।"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ডিভাইসটি পরিচালনা করছে:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nআপনার প্রশাসক ইমেল, অ্যাপ্লিকেশান ও নিরাপদ ওয়েবসাইটগুলি সহ আপনার নেটওয়ার্ক ক্রিয়াকলাপ নিরীক্ষণ করতে সক্ষম। আরো তথ্যের জন্য, আপনার প্রশাসকের সঙ্গে যোগাযোগ করুন।\n\nআপনি \"<xliff:g id="APPLICATION">%2$s</xliff:g>\"-কে একটি VPN সংযোগ সেট আপ করার অনুমতি দিয়েছেন। এই অ্যাপ্লিকেশান নেটওয়ার্ক ক্রিয়াকলাপও নিরীক্ষণ করতে পারে।"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ডিভাইসটি পরিচালনা করছে:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nআপনার প্রশাসক ইমেল, অ্যাপ্লিকেশান ও নিরাপদ ওয়েবসাইটগুলি সহ আপনার নেটওয়ার্ক ক্রিয়াকলাপ নিরীক্ষণ করতে সক্ষম। আরো তথ্যের জন্য, আপনার প্রশাসকের সঙ্গে যোগাযোগ করুন।\n\nএছাড়াও, আপনি একটি VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") এ সংযুক্ত আছেন। আপনার VPN পরিষেবা প্রদানকারী নেটওয়ার্ক ক্রিয়াকলাপও নিরীক্ষণ করতে পারে।"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index b44912c..e8d8e03 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Esborra"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Elimina de la llista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informació de l\'aplicació"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"No hi ha aplicacions recents"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Omet les aplicacions recents"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Una aplicació recent"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Enrere"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Pàgina d\'inici"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menú"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicacions recents"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Cerca"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Càmera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telèfon"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificació omesa."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Àrea de notificacions"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Configuració ràpida."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicacions recents."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuració"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuari <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mòbil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Tanca el tauler."</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Més temps"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menys temps"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"L\'ús de dades 2G-3G està desactivat"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"L\'ús de dades 4G està desactivat"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Les dades mòbils estan desactivades"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Utilitzats: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertiment: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"No hi ha aplicacions recents."</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informació de l\'aplicació"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"bloqueig d\'aplicació"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"No sentiràs l\'alarma a les <xliff:g id="ALARM_TIME">%s</xliff:g>."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificacions menys urgents a continuació"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Torna a tocar per obrir-la."</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Fes lliscar el dit cap amunt per desbloquejar el teclat."</string>
<string name="phone_hint" msgid="3101468054914424646">"Fes lliscar el dit cap a la dreta per obrir el telèfon."</string>
<string name="camera_hint" msgid="5241441720959174226">"Fes lliscar el dit cap a l\'esquerra per obrir la càmera."</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritàries"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Totes"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Carregant (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> per completar la càrrega)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Afegeix un usuari"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Usuari nou"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Convidat"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Convidat"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Surt del mode de convidat"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Suprimeix l\'usuari"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Vols sortir de la sessió de convidat?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Si surts de la sessió de convidat, se suprimiran dades locals."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Benvingut de nou, convidat."</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vols iniciar una sessió nova?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sí"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, gràcies"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Durant un minut"</item>
<item quantity="other" msgid="6924190729213550991">"Durant %d minuts"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Estàs connectat a una VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nEl proveïdor de serveis de VPN pot supervisar el dispositiu i l\'activitat de la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Administrador del dispositiu:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nL\'administrador pot supervisar la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs. Per obtenir més informació, contacta amb l\'administrador.\n\nA més, has donat permís a \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" per configurar una connexió VPN. Aquesta aplicació també pot supervisar l\'activitat de xarxa."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Administrador del dispositiu:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nL\'administrador pot supervisar la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs. Per obtenir més informació, contacta amb l\'administrador.\n\nA més, estàs connectat a una VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). El proveïdor del servei VPN també pot supervisar l\'activitat de xarxa."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 52312b0..bd7e77b 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Vymazat"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Odebrat ze seznamu"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informace o aplikaci"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Žádné nové aplikace"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Zavřít nové aplikace"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 nová aplikace"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Zpět"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Domů"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nové aplikace"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Hledat"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotoaparát"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Oznámení je zavřeno."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Panel oznámení."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Rychlé nastavení."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Naposledy použité aplikace"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavení"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Uživatel <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Zavřít panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Delší doba"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Kratší doba"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Data 2G a 3G jsou vypnuta"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Data 4G jsou vypnuta"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobilní data jsou vypnuta"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Využito: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornění při <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Žádné nedávné aplikace"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informace o aplikaci"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"uzamknout v aplikaci"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"vyhledat"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Neuslyšíte budík v <xliff:g id="ALARM_TIME">%s</xliff:g>."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Méně urgentní oznámení níže"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Oznámení otevřete opětovným klepnutím"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Zařízení odemknete přejetím prstem nahoru"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefon otevřete přejetím prstem vpravo."</string>
<string name="camera_hint" msgid="5241441720959174226">"Fotoaparát otevřete přejetím prstem vlevo."</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritní"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Vše"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Nabíjení (plně nabito za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Přidat uživatele"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nový uživatel"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Host"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Přidat hosta"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Ukončit relaci hosta"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Odstranit hosta"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Ukončit relaci hosta?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Po ukončení relace hosta budou odstraněna místní data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Vítejte zpět v relaci hosta!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Chcete zahájit novou relaci?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ano"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ne, děkuji"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Na jednu minutu"</item>
<item quantity="other" msgid="6924190729213550991">"Na %d min"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Jste připojeni k síti VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nPoskytovatel připojení VPN může sledovat vaši aktivitu zařízení a aktivitu v síti, včetně e-mailů, aplikací a zabezpečených webových stránek."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Toto zařízení je spravováno následující organizací:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávce může sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a zabezpečených webových stránek. Další informace získáte od svého správce.\n\nNavíc jste aplikaci <xliff:g id="APPLICATION">%2$s</xliff:g> udělili oprávnění k nastavení připojení VPN. Aktivitu v síti může sledovat také tato aplikace."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Toto zařízení je spravováno následující organizací:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávce může sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a zabezpečených webových stránek. Další informace získáte od svého správce.\n\nNavíc jste připojeni také k síti VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Vaši aktivitu v síti může sledovat také poskytovatel připojení VPN."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index d1bb2e6..178197b 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ryd"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Fjern fra listen"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Oplysninger om appen"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Der er ingen seneste apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Luk de seneste apps"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 seneste app"</item>
@@ -39,9 +40,9 @@
<string name="invalid_charger_title" msgid="3515740382572798460">"USB-opladning understøttes ikke."</string>
<string name="invalid_charger_text" msgid="5474997287953892710">"Brug kun den oplader, der føler med."</string>
<string name="battery_low_why" msgid="4553600287639198111">"Indstillinger"</string>
- <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Vil du slå batterisparefunktionen til?"</string>
+ <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Vil du aktivere batterisparefunktionen?"</string>
<string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Aktivér"</string>
- <string name="battery_saver_start_action" msgid="5576697451677486320">"Aktivér batterisparefunktionen"</string>
+ <string name="battery_saver_start_action" msgid="5576697451677486320">"Aktivér batterisparefunktion"</string>
<string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Indstillinger"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
<string name="status_bar_settings_airplane" msgid="4879879698500955300">"Flytilstand"</string>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Tilbage"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Startskærm"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Seneste apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Søg"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Underretningen er annulleret."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Underretningspanel."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Hurtige indstillinger."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Seneste apps"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Indstillinger"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Bruger <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Luk panelet"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mere tid"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mindre tid"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G-data er deaktiveret"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-data er deaktiveret"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobildata er deaktiveret"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> brugt"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grænse: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel ved <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Der er ingen seneste apps"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Oplysninger om applikationen"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Bliv i app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Du vil ikke kunne høre din alarm kl. <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Mindre presserende underretninger nedenfor"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tryk igen for at åbne"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Stryg for at låse op"</string>
<string name="phone_hint" msgid="3101468054914424646">"Stryg til højre for at bruge telefonen"</string>
<string name="camera_hint" msgid="5241441720959174226">"Stryg til venstre for at åbne kameraet"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alle"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Opladning (fuldt opladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Tilføj bruger"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Ny bruger"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gæst"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gæst"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Forlad gæstesession"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Fjern gæst"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Vil du afslutte gæstesessionen?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Når gæstesessionen afsluttes, fjernes lokale data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Velkommen tilbage, gæst!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vil du starte en ny session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nej tak"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"I ét minut"</item>
<item quantity="other" msgid="6924190729213550991">"I %d minutter"</item>
@@ -288,7 +304,7 @@
</plurals>
<string name="battery_saver_notification_title" msgid="237918726750955859">"Batteribesparende er slået til"</string>
<string name="battery_saver_notification_text" msgid="820318788126672692">"Reducerer ydeevne og baggrundsdata"</string>
- <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Deaktiver batterisparefunktionen"</string>
+ <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Deaktiver batterisparefunktion"</string>
<string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g> %%"</string>
<string name="notification_hidden_text" msgid="1135169301897151909">"Indholdet er skjult"</string>
<string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> vil begynde at optage alt, hvad der vises på din skærm."</string>
@@ -303,8 +319,10 @@
<string name="open_app" msgid="4011771120339160755">"Åbn app"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Afbryd VPN-forbindelse"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"Denne enhed administreres af:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administrator kan overvåge din enhed og netværksaktivitet, herunder e-mails, apps og sikre websites.\n\nKontakt din administrator, hvis du vil have flere oplysninger."</string>
- <string name="monitoring_description_vpn" msgid="7288268682714305659">"Du har givet \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" tilladelse til at konfigurere en VPN-forbindelse.\n\nDenne app kan overvåge din netværksaktivitet, f.eks. e-mails, apps og sikre websites."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Du har givet \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" tilladelse til at konfigurere en VPN-forbindelse.\n\nDenne app kan overvåge din netværksaktivitet, herunder e-mails, apps og sikre websites."</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Du har forbindelse til et VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nDin VPN-udbyder kan overvåge din enhed og netværksaktivitet, herunder e-mails, apps og sikre websites."</string>
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Denne enhed administreres af:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administrator kan overvåge din netværksaktivitet, f.eks. e-mails, apps og sikre websites. Kontakt administratoren for at få flere oplysninger.\n\nDu gav også \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" tilladelse til at konfigurere en VPN-forbindelse. Denne app kan også overvåge netværksaktivitet."</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Denne enhed administreres af:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administrator kan overvåge din netværksaktivitet, f.eks. e-mails, apps og sikre websites. Kontakt administratoren for at få flere oplysninger.\n\nDu har også forbindelse til et VPN-netværk (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Din VPN-udbyder kan også overvåge netværksaktivitet."</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Denne enhed administreres af:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administrator kan overvåge din netværksaktivitet, f.eks. e-mails, apps og sikre websites. Kontakt administratoren for at få flere oplysninger.\n\nDu gav også \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" tilladelse til at konfigurere en VPN-forbindelse. Denne app kan også overvåge netværksaktiviteten."</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Denne enhed administreres af:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administrator kan overvåge din netværksaktivitet, f.eks. e-mails, apps og sikre websites. Kontakt administratoren for at få flere oplysninger.\n\nDu har også forbindelse til et VPN-netværk (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Din VPN-udbyder kan også overvåge netværksaktiviteten."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 3ffad8c..527ac56 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Löschen"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Aus Liste entfernen"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"App-Info"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Keine kürzlich geöffneten Apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Kürzlich geöffnete Apps schließen"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 kürzlich geöffnete App"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Zurück"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Startbildschirm"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menü"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Kürzlich geöffnete Apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Suchen"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefonnummer"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Benachrichtigung geschlossen"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Benachrichtigungsleiste"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Schnelleinstellungen"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Kürzlich geöffnete Apps"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Einstellungen"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Nutzer: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobilfunkverbindung: <xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="TYPE">%2$s</xliff:g>, <xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Fenster schließen"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mehr Zeit"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Weniger Zeit"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G/3G-Daten deaktiviert"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-Daten deaktiviert"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobilfunkdaten deaktiviert"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> verwendet"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> Datenlimit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Warnung für <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Keine neuen Apps"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"App-Info"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"App-Verriegelung"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Suche"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Lautloser Weckruf um <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Weniger dringende Benachrichtigungen unten"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Erneut tippen, um Benachrichtigung zu öffnen"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Zum Entsperren nach oben wischen"</string>
<string name="phone_hint" msgid="3101468054914424646">"Zum Öffnen des Telefons nach rechts wischen"</string>
<string name="camera_hint" msgid="5241441720959174226">"Zum Öffnen der Kamera nach links wischen"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Wichtig"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alle"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Wird aufgeladen (voll in <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Nutzer hinzufügen"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Neuer Nutzer"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gast"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gast"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Gastmodus beenden"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Gast entfernen"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Gastsitzung beenden?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Wenn Sie die Gastsitzung verlassen, werden alle lokal gespeicherten Daten entfernt."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Willkommen zurück im Gastmodus"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Möchten Sie eine neue Sitzung starten?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nein danke"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Für eine Minute"</item>
<item quantity="other" msgid="6924190729213550991">"Für %d Minuten"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Sie sind mit einem VPN verbunden: <xliff:g id="APPLICATION">%1$s</xliff:g>.\n\nIhr VPN-Anbieter kann Ihr Gerät und Ihre Netzwerkaktivität überwachen, einschließlich E-Mails, Apps und sicherer Websites."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Dieses Gerät wird verwaltet von:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nIhr Administrator kann Ihre Netzwerkaktivitäten überwachen, darunter E-Mails, Apps und sichere Websites. Mehr erfahren Sie von Ihrem Administrator.\n\nSie haben zudem \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" gestattet, eine VPN-Verbindung herzustellen. Diese App kann auch Ihre Netzwerkaktivitäten überwachen."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Dieses Gerät wird verwaltet von:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nIhr Administrator kann Ihre Netzwerkaktivitäten überwachen, einschließlich E-Mails, Apps und sicherer Websites. Mehr erfahren Sie von Ihrem Administrator.\n\nSie sind zudem mit einem VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") verbunden. Ihr VPN-Anbieter kann ebenfalls Ihre Netzwerkaktivitäten überwachen."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 42a81a9..49169e6 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Εκκαθάριση"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Κατάργηση από τη λίστα"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Πληροφορίες εφαρμογής"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Δεν υπάρχουν πρόσφατες εφαρμογές"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Παράβλεψη πρόσφατων εφαρμογών"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 πρόσφατη εφαρμογή"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Πίσω"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Αρχική σελίδα"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Μενού"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Πρόσφατες εφαρμογές"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Αναζήτηση"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Φωτογραφική μηχανή"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Τηλέφωνο"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Η ειδοποίηση έχει απορριφθεί."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Πλαίσιο σκίασης ειδοποιήσεων."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Γρήγορες ρυθμίσεις."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Πρόσφατες εφαρμογές"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ρυθμίσεις"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Χρήστης <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Κινητό <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Κλείσιμο παραθύρου"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Περισσότερος χρόνος"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Λιγότερος χρόνος"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Τα δεδομένα 2G-3G είναι ανενεργά"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Τα δεδομένα 4G είναι ανενεργά"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Τα δεδομένα κινητής τηλεφωνίας είναι ανενεργά"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Χρησιμοποιούνται <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Όριο <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Προειδοποίηση για <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Καμία πρόσφατη εφαρμογή"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Πληροφορίες εφαρμογής"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lock to app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"αναζήτηση"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Δεν θα ακούτε το ξυπνητήρι σας στις <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Λιγότερο επείγουσες ειδοποιήσεις παρακάτω"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Πατήστε ξανά για να ανοίξετε"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Σύρετε για να ξεκλειδώσετε"</string>
<string name="phone_hint" msgid="3101468054914424646">"Σύρετε προς τα δεξιά για το τηλέφωνο"</string>
<string name="camera_hint" msgid="5241441720959174226">"Σύρετε αριστερά για τη φωτογραφική μηχανή"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Προτεραιότητα"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Όλα"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Φόρτιση (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> για πλήρη φόρτιση)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Προσθήκη χρήστη"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Νέος χρήστης"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Επισκέπτης"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Επισκέπτης"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Έξοδος επισκέπτη"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Κατάργηση επισκέπτη"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Έξοδος από την περίοδο σύνδεσης επισκέπτη;"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Η έξοδος από την περίοδο σύνδεσης επισκέπτη θα καταργήσει τα τοπικά δεδομένα."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Επισκέπτη , καλώς όρισες ξανά!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Θέλετε να ξεκινήσετε μια νέα περίοδο σύνδεσης;"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ναι"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Όχι, ευχαριστώ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Για ένα λεπτό"</item>
<item quantity="other" msgid="6924190729213550991">"Για %d λεπτά"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Είστε συνδεδεμένοι σε VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nΟ πάροχος της υπηρεσίας VPN μπορεί να παρακολουθεί τη δραστηριότητα της συσκευής σας και του δικτύου, συμπεριλαμβανομένων των μηνυμάτων ηλεκτρονικού ταχυδρομείου, των εφαρμογών και των ασφαλών ιστότοπων."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Η διαχ. της συσκευής γίνεται από:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nΟ διαχειριστής μπορεί να παρακ. τη δραστ. του δικτύου, όπως τα μην. ηλ. ταχυδρ., τις εφαρ. και τους ασφ. ιστότ. Για περισ. πληροφορίες, επικοιν. με το διαχειριστή.\n\nΕπίσης, επιτρέψατε στο \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" να ρυθμίσει σύνδεση VPN. Αυτή η εφαρ. μπορεί να παρακ. τη δραστ. του δικτύου."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Η διαχείριση της συσκευής γίνεται από:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nΟ διαχειριστής μπορεί να παρακολ. τη δραστ. του δικτύου, όπως τα μην. ηλεκ. ταχυδρ., τις εφαρμογές και τους ασφαλείς ιστότοπους. Για περισ. πληροφορίες, επικοιν. με το διαχειριστή.\n\nΕπίσης, είστε συνδεδ. σε VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Ο παροχέας VPN μπορεί να παρακολ. τη δραστ. του δικτύου."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index a0808d8..b7af804 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Clear"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Remove from list"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"App info"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"No recent apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Dismiss recent apps"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 recent app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Back"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Recent apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Search"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Phone"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification dismissed."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Notification shade."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Quick settings."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Recent apps"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobile <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Close panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"More time"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Less time"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G data is off"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G data is off"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobile data is off"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> used"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"No recent apps"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lock to app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"You won\'t hear your alarm at <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Less urgent notifications below"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string>
<string name="phone_hint" msgid="3101468054914424646">"Swipe right for phone"</string>
<string name="camera_hint" msgid="5241441720959174226">"Swipe left for camera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priority"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"All"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Add user"</string>
<string name="user_new_user_name" msgid="426540612051178753">"New user"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Guest"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Guest"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Exit guest"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Remove guest"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Exiting guest session?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Exiting the guest session will remove local data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Welcome back, guest!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Do you want to start a new session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Yes"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, thanks"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"For one minute"</item>
<item quantity="other" msgid="6924190729213550991">"For %d minutes"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"You\'re connected to a VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nYour VPN service provider can monitor your device and network activity including emails, apps and secure websites."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index a0808d8..b7af804 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Clear"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Remove from list"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"App info"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"No recent apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Dismiss recent apps"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 recent app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Back"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Recent apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Search"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Phone"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification dismissed."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Notification shade."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Quick settings."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Recent apps"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobile <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Close panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"More time"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Less time"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G data is off"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G data is off"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobile data is off"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> used"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"No recent apps"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lock to app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"You won\'t hear your alarm at <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Less urgent notifications below"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string>
<string name="phone_hint" msgid="3101468054914424646">"Swipe right for phone"</string>
<string name="camera_hint" msgid="5241441720959174226">"Swipe left for camera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priority"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"All"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charging (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> until full)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Add user"</string>
<string name="user_new_user_name" msgid="426540612051178753">"New user"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Guest"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Guest"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Exit guest"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Remove guest"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Exiting guest session?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Exiting the guest session will remove local data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Welcome back, guest!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Do you want to start a new session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Yes"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, thanks"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"For one minute"</item>
<item quantity="other" msgid="6924190729213550991">"For %d minutes"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"You\'re connected to a VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nYour VPN service provider can monitor your device and network activity including emails, apps and secure websites."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 547c45f..71c9919 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Eliminar"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Eliminar de la lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Información de la aplicación"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ninguna aplicación reciente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Rechazar aplicaciones recientes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicación reciente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Atrás"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Página principal"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menú"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicaciones recientes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Buscar"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Cámara"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Teléfono"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificación ignorada"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Pantalla de notificaciones"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Configuración rápida"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicaciones recientes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuración"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Móvil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Cerrar panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Más tiempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menos tiempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Datos 2G-3G desactivados"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Datos 4G desactivados"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Datos móviles desactivados"</string>
@@ -181,8 +187,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"La ubicación se estableció por GPS"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas las notificaciones"</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"Configuración"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girará automáticamente."</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"La pantalla está bloqueada en modo horizontal."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"La pantalla está bloqueada en modo vertical."</string>
@@ -241,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Utilizados: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"No hay aplicaciones recientes."</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"fijar aplicación"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
@@ -261,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"No oirás la alarma a la(s) <xliff:g id="ALARM_TIME">%s</xliff:g>."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificaciones menos urgentes abajo"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Presionar de nuevo para abrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Deslizar el dedo hacia arriba para desbloquear"</string>
<string name="phone_hint" msgid="3101468054914424646">"Desliza hacia la derecha para abrir el teléfono."</string>
<string name="camera_hint" msgid="5241441720959174226">"Desliza hacia la izquierda para acceder a la cámara."</string>
@@ -270,19 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioridad"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Todo"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Cargando (faltan <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para completar)"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"Agregar usuario"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"Usuario nuevo"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Invitado"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Agregar invitado"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Salir de modo invitado"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Eliminar invitado"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"¿Deseas salir de la sesión de invitado?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Si sales de la sesión de invitado, se eliminarán los datos locales."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bienvenido nuevamente, invitado."</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"¿Deseas iniciar una nueva sesión?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sí"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, gracias"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Durante un minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item>
@@ -307,12 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"Supervisión de red"</string>
<string name="open_app" msgid="4011771120339160755">"Abrir aplicación"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Desconectar VPN"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
- <skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"Este dispositivo está administrado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nEl administrador puede supervisar la actividad de la red y del dispositivo, incluidos el correo electrónico, las aplicaciones y los sitios web seguros.\n\nPara obtener más información, comunícate con el administrador."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Permitiste que \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" configure una conexión VPN.\n\nEsta aplicación puede supervisar la actividad de la red y del dispositivo, incluidos el correo electrónico, las aplicaciones y los sitios web seguros."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Estás conectado a una VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nEl proveedor de servicios de VPN puede supervisar la actividad de la red y del dispositivo, incluidos el correo electrónico, las aplicaciones y los sitios web seguros."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Dispositivo está administrado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nEl administrador puede supervisar la actividad de red (correo electrónico, aplicaciones y sitios web seguros). Para más información, comunícate con el administrador.\n\nY permitiste que \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" configure una VPN. La aplicación también puede supervisar la actividad de red."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Dispositivo administrado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nEl administrador puede supervisar la actividad de red (correo electrónico, aplicaciones y sitios web seguros). Para más información, comunícate con el administrador.\n\nY estás conectado a una VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). El proveedor de servicios de VPN puede supervisar la actividad de red."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index f5cae15..c732090 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Eliminar de la lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Información de la aplicación"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"No hay aplicaciones recientes."</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ignorar aplicaciones recientes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicación reciente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Atrás"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Inicio"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menú"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicaciones recientes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Buscar"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Cámara"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Teléfono"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificación ignorada"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Pantalla de notificaciones"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Ajustes rápidos"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicaciones recientes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ajustes"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Móvil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Cerrar panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Más tiempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menos tiempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Datos 2G-3G desactivados"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Datos 4G desactivados"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Datos móviles desactivados"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> utilizado"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"No hay aplicaciones recientes"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"bloqueo de aplicación"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"No oirás tu alarma a las <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificaciones menos urgente abajo"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Toca de nuevo para abrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Desliza el dedo hacia arriba para desbloquear"</string>
<string name="phone_hint" msgid="3101468054914424646">"Desliza el dedo hacia la izquierda para acceder al teléfono"</string>
<string name="camera_hint" msgid="5241441720959174226">"Desliza el dedo hacia la izquierda para acceder a la cámara"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioridad"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Todo"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Cargando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hasta completar)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Añadir usuario"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nuevo usuario"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Invitado"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Añadir invitado"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Salir de modo invitado"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Eliminar invitado"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"¿Quieres salir de la sesión de invitado?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Si sales de la sesión de invitado, se eliminarán los datos locales."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Hola de nuevo, invitado"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"¿Quieres iniciar una nueva sesión?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sí"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, gracias"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Durante un minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Estás conectado a una red VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nTu proveedor de servicios de VPN puede supervisar la actividad de tu red y de tu dispositivo, incluidos correos electrónicos, aplicaciones y sitios web seguros."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Este dispositivo está administrado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nTu administrador puede supervisar la actividad de tu red, incluidos correos electrónicos, aplicaciones y sitios web seguros. Para obtener más información, ponte en contacto con tu administrador.\n\nAdemás, has concedido permiso a <xliff:g id="APPLICATION">%2$s</xliff:g> para configurar una red VPN. Esta aplicación también puede supervisar tu red."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Este dispositivo está administrado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nTu administrador puede supervisar la actividad de tu red, incluidos correos electrónicos, aplicaciones y sitios web seguros. Para obtener más información, ponte en contacto con tu administrador.\n\nAdemás, estás conectado a una red VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). El proveedor de servicios de VPN también puede supervisar la actividad de la red."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml
index 34b513a..f4a01f3 100644
--- a/packages/SystemUI/res/values-et-rEE/strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Kustuta"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Loendist eemaldamine"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Rakenduse teave"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Uusi rakendusi pole"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Loobu hiljutistest rakendustest"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 hiljutine rakendus"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Tagasi"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Kodu"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menüü"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Hiljutised rakendused"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Otsing"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kaamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Märguandest on loobutud."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Märguande vari."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Kiirseaded."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Hiljutised rakendused"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Seaded"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Kasutaja <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobiili <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Sule paneel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Rohkem aega"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Vähem aega"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G–3G andmeside on väljalülitatud"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G andmeside on väljalülitatud"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mob. andmeside väljalülitatud"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> on kasutatud"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hoiatus"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Hiljutisi rakendusi pole"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Rakenduste teave"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lukusta rakendusele"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Te ei kuule äratust <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Vähem kiireloomulised märguanded on allpool"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Avamiseks puudutage uuesti"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Lukustuse tühistamiseks pühkige üles"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefoni kasutamiseks pühkige paremale"</string>
<string name="camera_hint" msgid="5241441720959174226">"Kaamera kasutamiseks pühkige vasakule"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioriteet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Kõik"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Laadimine (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>, kuni seade on täis)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Kasutaja lisamine"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Uus kasutaja"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Külaline"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ külaline"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Välju külastaja režiimist"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Eemalda külaline"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Kas soovite väljuda külastajaseansist?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Külastajaseansist väljumisel eemaldatakse kohalikud andmed."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Tere tulemast tagasi, külaline!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Kas soovite alustada uut seanssi?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Jah"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ei, aitäh"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Üheks minutiks"</item>
<item quantity="other" msgid="6924190729213550991">"%d minutiks"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Olete ühendatud VPN-iga („<xliff:g id="APPLICATION">%1$s</xliff:g>”).\n\nTeie VPN-i teenusepakkuja võib jälgida teie seadet ja võrgutegevust, sh meile, rakendusi ja turvalisi veebisaite."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Seda seadet haldab\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministraator saab jälgida teie võrgutegevust, sh meile, rakendusi ja turvalisi veebisaite. Lisateabe saamiseks võtke ühendust administraatoriga.\n\nLisaks andsite rakendusele „<xliff:g id="APPLICATION">%2$s</xliff:g>” loa seadistada VPN-i ühendus. See rakendus võib ka jälgida teie võrgutegevust."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Seda seadet haldab\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministraator saab jälgida teie võrgutegevust, sh meile, rakendusi ja turvalisi veebisaite. Lisateabe saamiseks võtke ühendust administraatoriga.\n\nSamuti olete ühendatud VPN-iga („<xliff:g id="APPLICATION">%2$s</xliff:g>”). VPN-i teenusepakkuja saab ka teie võrgutegevust jälgida."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml
index 3e6a1b7..185ee30 100644
--- a/packages/SystemUI/res/values-eu-rES/strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Garbitu"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Kendu zerrendatik"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Aplikazioaren informazioa"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ez dago azkenaldian erabilitako aplikaziorik"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Baztertu azken aplikazioak"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Aplikazio bat duela gutxi"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Atzera"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Hasiera"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menua"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Azken aplikazioak"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Bilatu"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefonoa"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Jakinarazpena baztertu da."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Jakinarazpenen panela."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Ezarpen bizkorrak."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Azken aplikazioak."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ezarpenak"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"<xliff:g id="USER">%s</xliff:g> erabiltzailea."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Datu mugikorrak: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Itxi panela"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Denbora gehiagoz"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Denbora gutxiagoz"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G datu-konexioa desaktibatuta dago"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G datu-konexioa desaktibatuta dago"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Datu mugikorrak desaktibatuta daude"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> erabilita"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Muga: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Abisua: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ez dago azkenaldian erabilitako aplikaziorik"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Aplikazioaren informazioa"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"aplikazio bakarreko modua"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"bilatu"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Ez duzu entzungo alarma ordu honetan: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Horren premiazkoak ez diren jakinarazpenak daude behean"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Irekitzeko, ukitu berriro"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Desblokeatzeko, pasatu hatza gorantz"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefonoa irekitzeko, pasatu hatza eskuinera."</string>
<string name="camera_hint" msgid="5241441720959174226">"Kamera irekitzeko, pasatu hatza ezkerrera."</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Lehentasuna"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Guztiak"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Kargatzen (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> guztiz kargatu arte)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Gehitu erabiltzailea"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Erabiltzaile berria"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gonbidatua"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gonbidatua"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Irten gonbidatuen modutik"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Kendu gonbidatua"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Gonbidatuentzako saiotik irten nahi duzu?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Gonbidatuentzako saiotik irteten bazara, datu lokalak kenduko dira."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Ongi etorri berriro, gonbidatu hori!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Beste saio bat hasi nahi duzu?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Bai"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ez, eskerrik asko"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Minutu batez"</item>
<item quantity="other" msgid="6924190729213550991">"%d minutuz"</item>
@@ -301,10 +317,12 @@
<string name="monitoring_title_device_owned" msgid="7121079311903859610">"Gailuen kontrola"</string>
<string name="monitoring_title" msgid="169206259253048106">"Sareen kontrola"</string>
<string name="open_app" msgid="4011771120339160755">"Ireki aplikazioa"</string>
- <string name="disconnect_vpn" msgid="1324915059568548655">"Deskonektatu VPNa"</string>
+ <string name="disconnect_vpn" msgid="1324915059568548655">"Deskonektatu VPN sarea"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"Honek kudeatzen du gailua:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratzaileak gailua eta sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne.\n\nInformazio gehiago lortzeko, jarri administratzailearekin harremanetan."</string>
<string name="monitoring_description_vpn" msgid="7288268682714305659">"VPN konexioa konfiguratzeko baimena eman diozu \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" aplikazioari.\n\nAplikazioak gailua eta sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne."</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN sarera konektatuta zaude (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nVPN zerbitzu-hornitzaileak gailua eta sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Honek kudeatzen du gailua:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratzaileak sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne.Informazio gehiago lortzeko, jarri administratzailearekin harremanetan.\n\nGainera, VPN konexio bat ezartzeko baimena eman diozu \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" aplikazioari. Aplikazioak ere kontrola ditzake sarean egiten dituzun jarduerak."</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Honek kudeatzen du gailua:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratzaileak sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne. Informazio gehiago lortzeko, jarri administratzailearekin harremanetan.\n\nGainera, VPN batera konektatuta zaude (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). VPN hornitzaileak ere kontrola ditzake sarean egiten dituzun jarduerak."</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Honek kudeatzen du gailua:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratzaileak sarean egiten dituzun jarduerak kontrola ditzake, mezu elektronikoak, aplikazioak eta webgune seguruak barne. Informazio gehiago lortzeko, jarri administratzailearekin harremanetan.\n\nGainera, VPN sare batera konektatuta zaude (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). VPN hornitzaileak ere kontrola ditzake sarean egiten dituzun jarduerak."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 3d8a182..7caba87 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"پاک کردن"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"حذف از لیست"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"اطلاعات برنامه"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"برنامه جدیدی موجود نیست"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"رد کردن برنامههای اخیر"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 برنامه اخیر"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"برگشت"</string>
<string name="accessibility_home" msgid="8217216074895377641">"صفحهٔ اصلی"</string>
<string name="accessibility_menu" msgid="316839303324695949">"منو"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"برنامههای اخیر"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"جستجو"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"دوربین"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"تلفن"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"اعلان ردشد."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"مجموعه اعلان."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"تنظیمات سریع."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"برنامههای اخیر"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"تنظیمات"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"کاربر <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"تلفن همراه <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"بستن پانل"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"زمان بیشتر"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"زمان کمتر"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"داده 2G-3G خاموش است"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"داده 4G خاموش است"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"داده شبکه سلولی خاموش است"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> استفاده شده"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> محدودیت"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"هشدار <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"هیچ برنامه جدیدی موجود نیست"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"اطلاعات برنامه"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"قفل به برنامه"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"هشدارتان را در ساعت <xliff:g id="ALARM_TIME">%s</xliff:g> نخواهید شنید"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"اعلانهای کمتر فوری در زیر"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"برای باز کردن دوباره ضربه بزنید"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"برای باز کردن قفل سریع به بالا بکشید"</string>
<string name="phone_hint" msgid="3101468054914424646">"برای تلفن انگشت را تند به سمت چپ بکشید"</string>
<string name="camera_hint" msgid="5241441720959174226">"برای دوربین انگشت را تند به سمت راست بکشید"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"اولویت"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"همه"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"در حال شارژ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> تا شارژ کامل)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"افزودن کاربر"</string>
<string name="user_new_user_name" msgid="426540612051178753">"کاربر جدید"</string>
<string name="guest_nickname" msgid="8059989128963789678">"مهمان"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ مهمان"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"خروج مهمان"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"حذف مهمان"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"از جلسه مهمان خارج میشوید؟"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"خروج از جلسه مهمان، دادههای محلی را حذف خواهد کرد."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"مهمان گرامی، بازگشتتان را خوش آمد میگوییم!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"میخواهید یک جلسه جدید را شروع کنید؟"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"بله"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"نه، متشکرم"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"برای یک دقیقه"</item>
<item quantity="other" msgid="6924190729213550991">"برای %d دقیقه"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"به VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") وصل هستید.\n\nارائهدهنده سرویس VPN میتواند دستگاه و فعالیت شبکهتان را کنترل کند از جمله ایمیلها، برنامهها و وبسایتهای ایمن."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"مدیریت این دستگاه توسط:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nسرپرستتان میتواند فعالیت شبکهتان را کنترل کند، از جمله ایمیلها، برنامهها و وبسایتهای ایمن. برای کسب اطلاعات بیشتر، با سرپرستتان تماس بگیرید.\n\nهمچنین، به \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" اجازه دادید تا اتصال VPN را تنظیم کند. این برنامه میتواند فعالیت شبکه را نیز کنترل کند."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"مدیریت این دستگاه توسط:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nسرپرستتان میتواند فعالیت شبکهتان را کنترل کند از جمله ایمیلها، برنامهها، و وبسایتهای ایمن. برای کسب اطلاعات بیشتر، با سرپرستتان تماس بگیرید.\n\nهمچنین، به VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") وصل هستید. ارائهدهنده سرویس VPN شما میتواند فعالیت شبکه را نیز کنترل کند."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index b6eeb816..37c3b7d 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Tyhjennä"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Poista luettelosta"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Sovelluksen tiedot"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ei viimeisimpiä sovelluksia"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Hylkää viimeaikaiset sovellukset"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 viimeaikainen sovellus"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Takaisin"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Aloituspainike"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Valikko"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Viimeaikaiset sovellukset"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Haku"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Puhelin"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Ilmoitus hylätty."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Ilmoitusalue."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Pika-asetukset."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Viimeaikaiset sovellukset"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Käyttäjä: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobiiliverkkoyhteys: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Sulje paneeli"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Lisää aikaa"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Vähennä aikaa"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G–3G-tiedonsiirto ei ole käytössä"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-tiedonsiirto ei ole käytössä"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobiilitiedonsiirto ei ole käytössä"</string>
@@ -238,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"käytetty <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kiintiö <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> – varoitus"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ei viimeaikaisia sovelluksia"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Sovellustiedot"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lukitse sovellukseen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"haku"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Et kuule hälytystä klo <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Vähemmän kiireelliset ilmoitukset ovat alla"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Avaa napauttamalla uudelleen"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Avaa lukitus pyyhkäisemällä ylös"</string>
<string name="phone_hint" msgid="3101468054914424646">"Avaa puhelin pyyhkäisemällä oikealle"</string>
<string name="camera_hint" msgid="5241441720959174226">"Avaa kamera pyyhkäisemällä oikealle"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Tärkeät"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Kaikki"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Ladataan (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> kunnes täynnä)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Lisää käyttäjä"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Uusi käyttäjä"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Vieras"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Vieras"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Kirjaa vieras ulos"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Lopetetaanko vierasistunto?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Vierasistunnon lopettaminen poistaa paikalliset tiedot."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Tervetuloa takaisin!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Haluatko aloittaa uuden istunnon?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Kyllä"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ei kiitos"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Minuutiksi"</item>
<item quantity="other" msgid="6924190729213550991">"%d minuutiksi"</item>
@@ -309,4 +327,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Sinulla on VPN-yhteys (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nVPN-palveluntarjoaja saattaa tarkkailla laitteesi ja verkon toimintaa, kuten sähköposteja, sovelluksia ja turvallisia sivustoja."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Tämän laitteen hallinnoija on \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJärjestelmänvalvoja pystyy valvomaan toimiasi verkossa, esimerkiksi sähköpostin, sovellusten ja turvallisten verkkosivustojen käyttöä. Saat lisätietoja järjestelmänvalvojalta.\n\nAnnoit sovellukselle <xliff:g id="APPLICATION">%2$s</xliff:g> luvan VPN-yhteyden määrittämiseen. Myös se pystyy valvomaan toimiasi verkossa."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Tämän laitteen hallinnoija on \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJärjestelmänvalvoja pystyy valvomaan toimiasi verkossa, esimerkiksi sähköpostin, sovellusten ja turvallisten verkkosivustojen käyttöä. Saat lisätietoja järjestelmänvalvojalta.\n\nLisäksi on muodostettu VPN-yhteys (<xliff:g id="APPLICATION">%2$s</xliff:g>). VPN-palveluntarjoaja voi myös valvoa toimiasi verkossa."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 37be31b..c8dead8 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Effacer"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Supprimer de la liste"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informations sur l\'application"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Aucune application récente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Masquer les applications récentes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 application récente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Précédent"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Domicile"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Applications récentes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Rechercher"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Appareil photo"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Téléphone"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification masquée"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Volet des notifications"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Paramètres rapides"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Applications récentes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Paramètres"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilisateur : <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Signal mobile : <xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="TYPE">%2$s</xliff:g>, <xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Fermer le panneau"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Plus longtemps"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Moins longtemps"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Données 2G/3G désactivées"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Données 4G désactivées"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Données cellulaire désactivées"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Quantité de données utilisées :<xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Aucune application récente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Détails de l\'application"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"verrouiller sur l\'application"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Vous n\'entendrez pas votre alarme à <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notifications moins urgentes affichées ci-dessous"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Touchez à nouveau pour ouvrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Glissez vers le haut pour déverrouiller"</string>
<string name="phone_hint" msgid="3101468054914424646">"Balayez l\'écran vers la droite pour accéder au téléphone"</string>
<string name="camera_hint" msgid="5241441720959174226">"Balayez l\'écran vers la gauche pour accéder à l\'appareil photo"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priorité"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tous"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charge en cours... (chargée à 100 % dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Ajouter un utilisateur"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nouvel utilisateur"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Invité"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Ajouter un invité"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Déconnecter l\'invité"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Supprimer l\'invité"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Désirez-vous quitter la session Invité?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Si vous quittez la session Invité, les données locales seront supprimées."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bienvenue à nouveau dans la session Invité"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Voulez-vous lancer une nouvelle session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Oui"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Non, merci"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Pendant une minute"</item>
<item quantity="other" msgid="6924190729213550991">"Pendant %d minutes"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Vous êtes connecté à un RPV (« <xliff:g id="APPLICATION">%1$s</xliff:g> »).\n\nVotre fournisseur de services RPV peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Cet appareil est géré par :\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVotre administrateur peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés. Pour en savoir plus à ce sujet, communiquez avec votre administrateur réseau.\n\nVous avez aussi autorisé « <xliff:g id="APPLICATION">%2$s</xliff:g> » à créer une connexion RPV. Cette application peut aussi surveiller votre activité réseau."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Cet appareil est géré par :\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVotre administrateur peut surveiller votre activité (courriels, applications, sites Web sécurisés, etc.). Pour en savoir plus, communiquez avec votre administrateur.\n\nVous êtes également connecté à un RPV (<xliff:g id="APPLICATION">%2$s</xliff:g>). Votre fournisseur RPV peut aussi surveiller votre activité réseau."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index bf4f5d3..9a3b185 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Effacer"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Supprimer de la liste"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informations sur l\'application"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Aucune application récente."</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Masquer les applications récentes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 application récente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Retour"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Accueil"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Applications récentes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Rechercher"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Appareil photo"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Téléphoner"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification masquée"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Volet des notifications"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Paramètres rapides"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Applications récentes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Paramètres"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilisateur <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Signal mobile : <xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="TYPE">%2$s</xliff:g>, <xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Fermer le panneau"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Plus longtemps"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Moins longtemps"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Données 2G-3G désactivées"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Données 4G désactivées"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Données mobiles désactivées"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> utilisés"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> au maximum"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Aucune application récente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informations sur l\'application"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"verrouiller sur l\'application"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Vous n\'entendrez pas votre alarme à <xliff:g id="ALARM_TIME">%s</xliff:g>."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notifications moins urgentes ci-dessous"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Appuyer à nouveau pour ouvrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Faire glisser pour déverrouiller"</string>
<string name="phone_hint" msgid="3101468054914424646">"Balayer l\'écran vers la droite pour accéder au téléphone"</string>
<string name="camera_hint" msgid="5241441720959174226">"Balayer l\'écran vers la gauche pour accéder à l\'appareil photo"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritaire"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Toutes"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charge en cours… (chargé à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Ajouter un utilisateur"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nouvel utilisateur"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Invité"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Ajouter un invité"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Quitter le mode Invité"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Supprimer l\'invité"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Quitter la session Invité ?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Si vous quittez la session Invité, les données locales seront supprimées."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bienvenue à nouveau dans la session Invité"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Voulez-vous lancer une nouvelle session ?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Oui"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Non, merci"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Pendant une minute"</item>
<item quantity="other" msgid="6924190729213550991">"Pendant %d minutes"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Vous êtes connecté à un VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nVotre fournisseur de services VPN peut surveiller votre activité réseau, y compris les e-mails, les applications et les sites Web sécurisés."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Cet appareil est géré par :\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVotre administrateur peut contrôler votre activité réseau (e-mails, applis et sites Web sécurisés). Pour en savoir plus, contactez votre administrateur.\n\nVous avez autorisé l\'appli \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" à configurer une connexion VPN. Cette appli peut également contrôler votre activité réseau."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Cet appareil est géré par :\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVotre administrateur peut contrôler votre activité réseau (e-mails, applications et sites sécurisés). Pour en savoir plus, contactez votre administrateur.\n\nVous êtes aussi connecté à un VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Votre fournisseur de services VPN peut également contrôler l\'activité réseau."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml
index 90ba2cd..17ae0f3 100644
--- a/packages/SystemUI/res/values-gl-rES/strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Quitar da lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Información da aplicación"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ningunha aplicación recente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Rexeitar aplicacións recentes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicación recente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Volver"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Inicio"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menú"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicacións recentes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Buscar"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Cámara"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Teléfono"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificación rexeitada"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Sombra de notificación"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Configuración rápida"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicacións recentes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Configuración"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Móbil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Pecha o panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Máis tempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menos tempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Os datos 2G-3G están desactivados"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Os datos 4G están desactivados"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Os datos móbiles están desactivados"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> usados"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ningunha aplicación recente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Información da aplicación"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"bloqueo de aplicación"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Non escoitarás a túa alarma ás <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificacións menos urxentes abaixo"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Toca de novo para abrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Pasa o dedo cara arriba para desbloquear"</string>
<string name="phone_hint" msgid="3101468054914424646">"Pasa o dedo cara á dereita para acceder ao teléfono"</string>
<string name="camera_hint" msgid="5241441720959174226">"Pasa o dedo cara á esquerda para abrir a cámara"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioridade"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Sempre"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Cargando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> para finalizar a carga)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Engadir usuario"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Novo usuario"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Convidado"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Convidado"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Retirar invitado"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Eliminar invitado"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Queres saír da sesión de convidado?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Ao saír da sesión de convidado, eliminaranse os datos locais."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Benvido de novo, convidado."</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Queres iniciar unha sesión nova?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Si"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Non, grazas"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Durante un minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item>
@@ -305,8 +321,10 @@
<string name="open_app" msgid="4011771120339160755">"Abrir aplicación"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Desconectar VPN"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"O teu dispositivo está xestionado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nO teu administrador pode controlar a actividade da rede e o dispositivo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros.\n\nPara obter máis información, contacta co administrador."</string>
- <string name="monitoring_description_vpn" msgid="7288268682714305659">"Outorgaches permiso a \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" para configurar unha conexión VPN.\n\nEsta aplicación pode controlar a actividade da rede e o dispositivo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros."</string>
- <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Estás conectado a unha VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nO teu fornecedor de servizo da VPN pode controlar a actividade da rede e o dispositivo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Outorgaches permiso a \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" para configurar unha conexión VPN.\n\nEsta aplicación pode controlar a actividade da rede e do dispositivo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Estás conectado a unha VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nO teu provedor de servizo de VPN pode controlar a actividade da rede e o dispositivo, incluídos os correos electrónicos, as aplicacións e os sitios web seguros."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Este dispositivo está xestionado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nO teu administrador pode supervisar a actividade da túa rede, incluídos os correos electrónicos, as aplicacións e os sitios web seguros. Para obter máis información, contacta co teu administrador.\n\nAdemais, outorgaches permiso a \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" para configurar unha conexión VPN. Esta aplicación tamén pode supervisar a actividade da rede."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Este dispositivo está xestionado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nO teu administrador pode supervisar a actividade da túa rede, incluídos os correos electrónicos, as aplicacións e os sitios web seguros. Para obter máis información, contacta co teu administrador.\n\nAdemais, estás conectado a unha VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). O fornecedor de servizos da VPN tamén pode supervisar a actividade da rede."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/SystemUI/res/values-h560dp-xhdpi/config.xml
similarity index 76%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to packages/SystemUI/res/values-h560dp-xhdpi/config.xml
index 89f4a0b..cf2017f 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/SystemUI/res/values-h560dp-xhdpi/config.xml
@@ -15,8 +15,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
+<resources>
+ <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
+ card. -->
+ <integer name="keyguard_max_notification_count">3</integer>
+</resources>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/SystemUI/res/values-h560dp-xhdpi/dimens.xml
similarity index 77%
rename from packages/SystemUI/res/drawable/trust_circle.xml
rename to packages/SystemUI/res/values-h560dp-xhdpi/dimens.xml
index 89f4a0b..f6dbc3d 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/SystemUI/res/values-h560dp-xhdpi/dimens.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -16,7 +15,7 @@
~ limitations under the License
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
+<resources>
+ <fraction name="keyguard_clock_y_fraction_max">32.5%</fraction>
+ <fraction name="keyguard_clock_y_fraction_min">24%</fraction>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/SystemUI/res/values-h560dp-xxhdpi/config.xml
similarity index 76%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to packages/SystemUI/res/values-h560dp-xxhdpi/config.xml
index 89f4a0b..b2231a6 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/SystemUI/res/values-h560dp-xxhdpi/config.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -15,8 +14,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
+<resources>
+ <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
+ card. -->
+ <integer name="keyguard_max_notification_count">4</integer>
+</resources>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/SystemUI/res/values-h560dp-xxhdpi/dimens.xml
similarity index 76%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to packages/SystemUI/res/values-h560dp-xxhdpi/dimens.xml
index 89f4a0b..905e9e3 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/SystemUI/res/values-h560dp-xxhdpi/dimens.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -16,7 +15,7 @@
~ limitations under the License
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
+<resources>
+ <fraction name="keyguard_clock_y_fraction_max">32.5%</fraction>
+ <fraction name="keyguard_clock_y_fraction_min">19.8%</fraction>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index ec9e88f..b140fa6 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"साफ़ करें"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"सूची से निकालें"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ऐप्स की जानकारी"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"कोई हाल ही के ऐप्स नहीं"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"हाल ही के ऐप्स खारिज करें"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 हाल ही का ऐप्स"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"वापस जाएं"</string>
<string name="accessibility_home" msgid="8217216074895377641">"होम"</string>
<string name="accessibility_menu" msgid="316839303324695949">"मेनू"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"हाल ही के ऐप्स"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"खोजें"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"कैमरा"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"फ़ोन"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"सूचना खारिज की गई."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"सूचना शेड."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"त्वरित सेटिंग."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"हाल ही के ऐप्स."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिंग"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"उपयोगकर्ता <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"मोबाइल <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"फलक बंद करें"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"अधिक समय"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"कम समय"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G डेटा बंद है"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G डेटा बंद है"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"सेल्युलर डेटा बंद है"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> उपयोग किया गया"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"कोई हाल ही का ऐप्स नहीं"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"एप्लिकेशन जानकारी"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"ऐप्स पर लॉक करें"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"आपको <xliff:g id="ALARM_TIME">%s</xliff:g> पर अपना अलार्म सुनाई नहीं देगा"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"कम अत्यावश्यक सूचनाएं नीचे दी गई हैं"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"खोलने के लिए पुन: टैप करें"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"अनलॉक करने के लिए ऊपर स्वाइप करें"</string>
<string name="phone_hint" msgid="3101468054914424646">"फ़ोन के लिए दाएं स्वाइप करें"</string>
<string name="camera_hint" msgid="5241441720959174226">"कैमरे के लिए बाएं स्वाइप करें"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"प्राथमिकता"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"सभी"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"चार्ज हो रहा है (पूर्ण होने में <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> शेष)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"उपयोगकर्ता जोड़ें"</string>
<string name="user_new_user_name" msgid="426540612051178753">"नया उपयोगकर्ता"</string>
<string name="guest_nickname" msgid="8059989128963789678">"अतिथि"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ अतिथि"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"अतिथि मोड से बाहर निकलें"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"अतिथि को निकालें"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"अतिथि सत्र से बाहर निकलना है?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"अतिथि सत्र से बाहर निकलने से स्थानीय डेटा निकल जाएगा."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"अतिथि, आपका पुन: स्वागत है!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"क्या आप नया सत्र प्रारंभ करना चाहते हैं?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"हां"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"नहीं, धन्यवाद"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"एक मिनट के लिए"</item>
<item quantity="other" msgid="6924190729213550991">"%d मिनट के लिए"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"आप VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") से कनेक्ट हैं.\n\nआपका VPN सेवा प्रदाता ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपके उपकरण और नेटवर्क गतिविधि की निगरानी कर सकता है."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"यह उपकरण इसके द्वारा प्रबंधित है:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nआपका व्यवस्थापक ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर कर सकता है. अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.\n\nसाथ ही, आपने VPN कनेक्शन सेट करने के लिए \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" अनुमति भी दी है. यह ऐप्स नेटवर्क गतिविधि को भी मॉनीटर कर सकता है."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"यह उपकरण इसके द्वारा प्रबंधित है:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nआपका व्यवस्थापक, ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर कर सकता है. अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.\n\nसाथ ही, आप VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") से कनेक्ट हैं. आपका VPN सेवा प्रदाता नेटवर्क गतिविधि को भी मॉनीटर कर सकता है."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index 809ce96..1894188 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Očisti"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Ukloni s popisa"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informacije o aplikaciji"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nema nedavnih aplikacija"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Odbaci nedavne aplikacije"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 nedavna aplikacija"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Natrag"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Početna"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Izbornik"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nedavne aplikacije"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Pretraži"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotoaparat"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Obavijest je odbačena."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Zaslon obavijesti."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Brze postavke."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Nedavne aplikacije."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Postavke"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Korisnik <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobitel <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Zatvori ploču"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Više vremena"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Manje vremena"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G podaci isključeni"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G podaci isključeni"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobilni podaci isključeni"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> iskorišteno"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje od <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nema nedavnih aplikacija"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"zaključaj na aplikaciju"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Nećete čuti alarm u <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Manje hitne obavijesti pri dnu"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Dodirnite opet za otvaranje"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Prijeđite prstom prema gore za otključavanje"</string>
<string name="phone_hint" msgid="3101468054914424646">"Prijeđite prstom udesno za telefon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Prijeđite prstom ulijevo za fotoaparat"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Sve"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napunjenosti)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Dodavanje korisnika"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Novi korisnik"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gost"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ gost"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Izlaz iz gostujućeg načina"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Uklanjanje gosta"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Želite li napustiti gostujuću sesiju?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Zatvaranjem gostujuće sesije uklonit će se lokalni podaci."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Dobro došli natrag, gostu!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Želite li započeti novu sesiju?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Da"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ne, hvala"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Jednu minutu"</item>
<item quantity="other" msgid="6924190729213550991">"%d min"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Povezani ste s VPN-om (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nDavatelj usluge VPN-a može pratiti vaš uređaj i aktivnost na mreži, uključujući e-poštu, aplikacije i sigurne web-lokacije."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Uređajem upravlja:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVaš administrator može pratiti vašu aktivnost na mreži, uključujući e-poštu, aplikacije i sigurne web-lokacije. Više informacija možete saznati od administratora.\n\nOsim toga, dali ste aplikaciji \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" dopuštenje za postavljanje VPN veze, pa i ona može pratiti vašu aktivnost na mreži."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Uređajem upravlja:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nVaš administrator može pratiti vašu aktivnost na mreži, uključujući e-poštu, aplikacije i sigurne web-lokacije. Više informacija možete saznati od administratora.\n\nOsim toga, povezani ste s VPN-om (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Davatelj usluge VPN-a također može pratiti vašu aktivnost na mreži."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 75f6bb9..36f7053 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Törlés"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Eltávolítás a listából"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Alkalmazásinformáció"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nincs újabb alkalmazás"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Újabb alkalmazások elvetése"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 újabb alkalmazás"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Vissza"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Főoldal"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menü"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Legújabb alkalmazás"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Keresés"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Értesítés elvetve."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Értesítési felület."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Gyorsbeállítások."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Legutóbbi alkalmazások"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Beállítások"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Felhasználó: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Panel bezárása"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Több idő"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Kevesebb idő"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"A 2G-s és 3G-s adatkapcsolat nem használható"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"A 4G-s adatkapcsolat nem használható"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"A mobiladat-kapcsolat nem használható"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> felhasználva"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> korlát"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Figyelem! <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nincsenek nemrég használt alkalmazások"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Az alkalmazás adatai"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"alkalmazászárolás"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Nem fogja hallani az ébresztést ekkor: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"A kevésbé sürgős értesítések lentebb vannak"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Koppintson rá ismét a megnyitáshoz"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Húzza felfelé az ujját a feloldáshoz"</string>
<string name="phone_hint" msgid="3101468054914424646">"A telefon eléréséhez csúsztassa ujját jobbra"</string>
<string name="camera_hint" msgid="5241441720959174226">"A fényképezőgép eléréséhez csúsztassa ujját balra"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritást élvező"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Összes"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Töltés (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> a teljes töltöttségig)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Felhasználó hozzáadása"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Új felhasználó"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Vendég"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ vendég"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Vendég kiléptetése"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Vendég munkamenet eltávolítása"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Kilép a vendég-munkafolyamatból?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"A vendég-munkafolyamatból való kilépéssel eltávolítja a helyi adatokat."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Örülünk, hogy visszatért, vendég!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Új munkamenetet szeretne indítani?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Igen"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nem, köszönöm"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Egy percen át"</item>
<item quantity="other" msgid="6924190729213550991">"%d percen át"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Ön egy VPN-hez kapcsolódott („<xliff:g id="APPLICATION">%1$s</xliff:g>”).\n\nVPN-szolgáltatója figyelheti az Ön eszköz- és hálózati tevékenységét, beleértve az e-maileket, az alkalmazásokat és a biztonságos webhelyeket."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Ezt az eszközt a következő felügyeli:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nA rendszergazda figyelheti a hálózati tevékenységet, beleértve az e-mailt, az alkalmazásokat és a biztonságos webhelyeket. További információért forduljon a rendszergazdához.\n\nEzenfelül engedélyt adott „<xliff:g id="APPLICATION">%2$s</xliff:g>” számára VPN-kapcsolat beállítására. Ez az alkalmazás is figyelheti a hálózati tevékenységet."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Ezt az eszközt a következő felügyeli:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nA rendszergazda figyelheti a hálózati tevékenységet, beleértve az e-mailt, az alkalmazásokat és a biztonságos webhelyeket. További információért forduljon a rendszergazdához.\n\nEzenfelül VPN-hez is csatlakozik („<xliff:g id="APPLICATION">%2$s</xliff:g>”). VPN-szolgáltatója is figyelheti hálózati tevékenységét."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml
index e632ac1..7a8e741 100644
--- a/packages/SystemUI/res/values-hy-rAM/strings.xml
+++ b/packages/SystemUI/res/values-hy-rAM/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Մաքրել"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Հեռացնել ցանկից"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Տեղեկություններ ծրագրի մասին"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Թարմ հավելվածներ չկան"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Անտեսել վերջին ծրագրերը"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 նոր ծրագիր"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Հետ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Տուն"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Ցանկ"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Վերջին ծրագրերը"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Որոնել"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Ֆոտոխցիկ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Հեռախոս"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Ծանուցումը անտեսվեց:"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Ծանուցումների վահանակ:"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Արագ կարգավորումներ:"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Վերջին հավելվածները:"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Օգտվող <xliff:g id="USER">%s</xliff:g>:"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>: <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Շարժական <xliff:g id="SIGNAL">%1$s</xliff:g>: <xliff:g id="TYPE">%2$s</xliff:g>: <xliff:g id="NETWORK">%3$s</xliff:g>:"</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Փակել վահանակը"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Ավելացնել ժամանակը"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Քչացնել ժամանակը"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G տվյալների կապն անջատված է"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G տվյալների կապն անջատված է"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Բջջային տվյալներն անջատված են"</string>
@@ -238,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Օգտագործված է՝ <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Սահմանաչափ՝ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> զգուշացում"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Նոր հավելվածներ չկան"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Հավելվածի մասին"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Lock-to-app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"որոնել"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Դուք չեք լսի ձեր զարթուցիչը <xliff:g id="ALARM_TIME">%s</xliff:g>-ին:"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Պակաս հրատապ ծանուցումները ստորև"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Կրկին հպեք՝ բացելու համար"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Սահեցրեք վերև` ապակողպելու համար"</string>
<string name="phone_hint" msgid="3101468054914424646">"Հեռախոսի համար սահեցրեք աջ"</string>
<string name="camera_hint" msgid="5241441720959174226">"Խցիկի համար սահեցրեք ձախ"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Կարևորություն"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Բոլորը"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Լիցքավորում (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> մինչև լրիվ լիցքավորումը)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Ավելացնել օգտվող"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Նոր օգտվող"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Հյուր"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Հյուր"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Դուրս գալ հյուրի ռեժիմից"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Դուրս գա՞լ հյուրի ռեժիմից:"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Հյուրի ռեժիմից դուրս գալուց հետո ձեր տեղական տվյալները կջնջվեն:"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Բարի վերադարձ, հյուր:"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Ցանկանո՞ւմ եք սկսել նոր աշխատաշրջան:"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Այո"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ոչ, շնորհակալություն"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Մեկ րոպե"</item>
<item quantity="other" msgid="6924190729213550991">"%d րոպե"</item>
@@ -307,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Դուք միացած եք VPN-ին («<xliff:g id="APPLICATION">%1$s</xliff:g>»):\n\nՁեզ VPN ծառայություն մատուցողը կարող է վերահսկել ձեր սարքի և ցանցի գործունեությունը, այդ թվում` նամակները, ծրագրերը և վստահելի կայքերը:"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Այս սարքը կառավարիչն է՝\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nՁեր ադմինիստրատորը կարող է վերահսկել ձեր ցանցային գործունեությունը, այդ թվում՝ նամակները, ծրագրերը և վստահելի կայքերը: Լրացուցիչ տեղեկությունների համար դիմեք ձեր ադմինիստրատորին:\n\n Բացի այդ, դուք «<xliff:g id="APPLICATION">%2$s</xliff:g>» ծրագրին թույլատրել եք ստեղծել VPN կապ: Այդ ծրագիրը նույնպես կարող է վերահսկել ձեր ցանցային գործունեությունը:"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Այս սարքը կառավարիչն է՝\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nՁեր ադմինիստրատորը կարող է վերահսկել ձեր ցանցային գործունեությունը, այդ թվում՝ նամակները, ծրագրերը և վստահելի կայքերը: Լրացուցիչ տեղեկությունների համար դիմեք ձեր ադմինիստրատորին:\n\nԲացի այդ, դուք միացած եք VPN-ին («<xliff:g id="APPLICATION">%2$s</xliff:g>»): Ձեզ VPN ծառայություն մատուցողը նույնպես կարող է վերահսկել ցանցային գործունեությունը:"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 90e50f5..10b08e7 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Bersihkan"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Hapus dari daftar"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Info apl"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Tidak ada apl terbaru"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Tutup aplikasi terbaru"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 apl terbaru"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Kembali"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Utama"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Apl terbaru"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Telusuri"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telepon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Pemberitahuan disingkirkan."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Bayangan pemberitahuan."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Setelan cepat."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplikasi terkini."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Setelan"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Pengguna <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Seluler <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Tutup panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Lebih lama"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Lebih cepat"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Data 2G-3G nonaktif"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Data 4G nonaktif"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Data seluler nonaktif"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> digunakan"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Batas <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Peringatan <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Tidak ada aplikasi terkini"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Info Aplikasi"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"kunci ke aplikasi"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"telusuri"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Anda tidak akan mendengar alarm pukul <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Pemberitahuan kurang darurat di bawah"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ketuk lagi untuk membuka"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Gesek ke atas untuk membuka kunci"</string>
<string name="phone_hint" msgid="3101468054914424646">"Gesek ke kanan untuk menelepon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Gesek ke kiri untuk kamera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritas"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Semua"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Mengisi daya (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hingga penuh)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Tambahkan pengguna"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Pengguna baru"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Tamu"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Tamu"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Keluar dari tamu"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Buang tamu"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Keluar dari sesi tamu?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Dengan keluar dari sesi tamu, Anda akan membuang data lokal."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Selamat datang kembali, tamu!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Ingin memulai sesi baru?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ya"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Tidak, terima kasih"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Selama satu menit"</item>
<item quantity="other" msgid="6924190729213550991">"Selama %d menit"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Anda tersambung ke VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nPenyedia layanan VPN dapat memantau perangkat dan aktivitas jaringan termasuk email, aplikasi, dan situs web aman."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Perangkat ini dikelola oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministrator Anda dapat memantau aktivitas jaringan termasuk email, aplikasi, dan situs web aman. Untuk informasi selengkapnya, hubungi administrator Anda.\n\nAnda juga memberikan izin pada \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" untuk menyiapkan sambungan VPN. Aplikasi ini juga memantau aktivitas jaringan."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Perangkat ini dikelola oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministrator Anda dapat memantau aktivitas jaringan termasuk email, aplikasi, dan situs web aman. Untuk informasi selengkapnya, hubungi administrator Anda.\n\nAnda juga tersambung ke VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Penyedia layanan VPN Anda dapat memantau aktivitas jaringan juga."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml
index 44f8d8c..c2565ce 100644
--- a/packages/SystemUI/res/values-is-rIS/strings.xml
+++ b/packages/SystemUI/res/values-is-rIS/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Hreinsa"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Fjarlægja af lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Upplýsingar um forrit"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Engin nýleg forrit"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Hunsa nýleg forrit"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Eitt nýlegt forrit"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Til baka"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Heim"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Valmynd"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nýleg forrit"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Leita"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Myndavél"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Sími"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Tilkynningu lokað."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Tilkynningasvæði."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Flýtistillingar."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Nýleg forrit."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Stillingar"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Notandi: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Farsímagögn: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Loka glugga"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Meiri tími"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Minni tími"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Slökkt er á 2G- og 3G-gögnum"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Slökkt er á 4G-gögnum"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Slökkt er á farsímagögnum"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> notuð"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hámark"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> viðvörun"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Engin nýleg forrit"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Forritsupplýsingar"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"forritslæsing"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"leita"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Ekki mun heyrast í vekjaranum kl. <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Minna áríðandi tilkynningar fyrir neðan"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ýttu aftur til að opna"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Strjúktu upp til að opna"</string>
<string name="phone_hint" msgid="3101468054914424646">"Strjúktu til hægri fyrir síma"</string>
<string name="camera_hint" msgid="5241441720959174226">"Strjúktu til vinstri fyrir myndavél"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Forgangur"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Allar"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Í hleðslu (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> fram að fullri hleðslu)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Bæta notanda við"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nýr notandi"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gestur"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gestur"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Loka gestastillingu"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Fjarlægja gest"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Ljúka gestalotu?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Staðbundin gögn verða fjarlægð þegar gestalotu lýkur."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Velkominn aftur, gestur!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Viltu hefja nýja lotu?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Já"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nei, takk"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Í eina mínútu"</item>
<item quantity="other" msgid="6924190729213550991">"Í %d mínútur"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Þú ert með tengingu við VPN-net („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nVPN-þjónustuaðilinn þinn getur fylgst með virkni þinni í tækinu og á netinu, þar á meðal tölvupósti, forritum og öruggum vefsvæðum."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Stjórnandi þessa tækis er:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nStjórnandinn getur fylgst með netvirkni þinni, þ. á m. tölvupósti, forritum og öruggum vefsvæðum. Hafðu samband við stjórnandann til að fá frekari upplýsingar.\n\nÞú veittir „<xliff:g id="APPLICATION">%2$s</xliff:g>“ einnig heimild til að setja upp VPN-tengingu. Þetta forrit getur líka fylgst með netvirkni þinni."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Stjórnandi þessa tækis er:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nStjórnandinn getur fylgst með netvirkni þinni, þ. á m. tölvupósti, forritum og öruggum vefsvæðum. Hafðu samband við stjórnandann til að fá frekari upplýsingar.\n\nÞú ert einnig tengd(ur) VPN-neti („<xliff:g id="APPLICATION">%2$s</xliff:g>“). VPN-þjónustuaðilinn þinn getur líka fylgst með netvirkni þinni."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index a45d4c0..9844f95 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Cancella"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Rimuovi dall\'elenco"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informazioni applicazione"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nessuna app recente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ignora app recenti"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 app recente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Indietro"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Applicazioni recenti"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Cerca"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotocamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefono"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notifica eliminata."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Area notifiche."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Impostazioni rapide."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"App recenti"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Impostazioni"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utente <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Cellulare: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Chiudi riquadro"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Più tempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Meno tempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Dati 2G-3G disattivati"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Dati 4G disattivati"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Rete dati disattivata"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> utilizzati"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite di <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avviso <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nessuna app recente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informazioni sull\'applicazione"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"blocca su app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Il tuo allarme non suonerà alle <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notifiche meno urgenti in basso"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tocca ancora per aprire"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Scorri verso l\'alto per sbloccare"</string>
<string name="phone_hint" msgid="3101468054914424646">"Scorri verso destra per accedere al telefono"</string>
<string name="camera_hint" msgid="5241441720959174226">"Scorri verso sinistra per accedere alla fotocamera"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priorità"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tutti"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"In carica (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> al termine)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Aggiungi utente"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nuovo utente"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Ospite"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ospite"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Esci dalla modalità ospite"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Rimuovi invitato"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Uscire dalla sessione Ospite?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Se esci dalla sessione Ospite verranno rimossi i dati locali."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bentornato, ospite."</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vuoi avviare una nuova sessione?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sì"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"No, grazie"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Per un minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Per %d minuti"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Sei collegato a una rete VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nIl tuo provider di servizi VPN può monitorare la tua attività di rete e sul dispositivo, inclusi email, app e siti web protetti."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Il dispositivo è gestito da:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nIl tuo amministratore può monitorare la tua attività di rete, inclusi email, app e siti web protetti. Per ulteriori informazioni, contatta l\'amministratore.\n\nInoltre, hai autorizzato \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" a configurare una connessione VPN. Questa app può monitorare anche l\'attività di rete."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Il dispositivo è gestito da:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nIl tuo amministratore può monitorare la tua attività di rete, inclusi email, app e siti web protetti. Per ulteriori informazioni, contatta l\'amministratore.\n\nInoltre, sei collegato a una rete VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Il tuo provider di servizi VPN può monitorare anche l\'attività di rete."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index 3bd7ab5..6b58398 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"נקה"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"הסר מהרשימה"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"פרטי אפליקציה"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"אין אפליקציות אחרונות"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"סגור אפליקציות אחרונות"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"אפליקציה אחרונה אחת"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"הקודם"</string>
<string name="accessibility_home" msgid="8217216074895377641">"בית"</string>
<string name="accessibility_menu" msgid="316839303324695949">"תפריט"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"אפליקציות אחרונות"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"חפש"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"מצלמה"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"טלפון"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"הודעה נדחתה."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"לוח הודעות."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"הגדרות מהירות."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"אפליקציות אחרונות"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"הגדרות"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"משתמש <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"נייד <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"סגור חלונית"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"יותר זמן"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"פחות זמן"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"נתונים בחיבור 2G-3G כובו"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"נתונים בחיבור 4G כובו"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"נתונים בחיבור סלולרי כובו"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> בשימוש"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"הגבלה של <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"אזהרה - <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"אין אפליקציות אחרונות"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"מידע על האפליקציה"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"נעל לאפליקציה"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"חפש"</string>
@@ -258,26 +265,35 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"לא תשמע את ההתראה שלך ב-<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"הודעות בדחיפות נמוכה יותר בהמשך"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"הקש שוב כדי לפתוח"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"החלק מעלה כדי לבטל את הנעילה"</string>
<string name="phone_hint" msgid="3101468054914424646">"החלק ימינה להפעלת הטלפון"</string>
- <string name="camera_hint" msgid="5241441720959174226">"החלק שמאלה להפעלת המצלמה"</string>
+ <string name="camera_hint" msgid="5241441720959174226">"החלק ימינה להפעלת המצלמה"</string>
<string name="zen_mode_forever" msgid="4316804956488785559">"ללא הגבלה"</string>
<string name="interruption_level_none" msgid="3831278883136066646">"ללא"</string>
<string name="interruption_level_priority" msgid="6517366750688942030">"עדיפות"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"הכל"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"טוען (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> עד לסיום)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"הוסף משתמש"</string>
<string name="user_new_user_name" msgid="426540612051178753">"משתמש חדש"</string>
<string name="guest_nickname" msgid="8059989128963789678">"אורח"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ אורח"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"צא ממצב אורח"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"הסר אורח"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"האם לצאת מהפעלת האורח?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"יציאה מהפעלת האורח תסיר נתונים מקומיים."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"ברוך שובך, אורח!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"האם ברצונך להתחיל הפעלה חדשה?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"כן"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"לא, תודה"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"למשך דקה אחת"</item>
<item quantity="other" msgid="6924190729213550991">"למשך %d דקות"</item>
@@ -305,6 +321,8 @@
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"המכשיר הזה מנוהל על ידי:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nמנהל המערכת שלך יכול לעקוב אחר המכשיר והפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nלמידע נוסף, צור קשר עם מנהל המערכת."</string>
<string name="monitoring_description_vpn" msgid="7288268682714305659">"נתת ל-\"<xliff:g id="APPLICATION">%1$s</xliff:g>\" הרשאה להגדרת חיבור VPN.\n\nהאפליקציה הזו יכולה לעקוב אחר המכשיר והפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות, ואתרים מאובטחים."</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"אתה מחובר ל-VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nספק שירות ה-VPN שלך יכול לעקוב אחר המכשיר והפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות ואתרים מאובטחים."</string>
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"מכשיר זה מנוהל על ידי:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nמנהל המערכת שלך יכול לעקוב אחר הפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות, ואתרים מאובטחים. למידע נוסף, צור קשר עם מנהל המערכת שלך.\n\nכמו כן, נתת ל-\"<xliff:g id="APPLICATION">%2$s</xliff:g>\" הרשאה להגדרת חיבור VPN. גם אפליקציה זו יכולה לעקוב אחר הפעילות שלך ברשת."</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"מכשיר זה מנוהל על ידי:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nמנהל המערכת שלך יכול לעקוב אחר הפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות, ואתרים מאובטחים. למידע נוסף, צור קשר עם מנהל המערכת שלך.\n\nכמו כן, נתת ל-\"<xliff:g id="APPLICATION">%2$s</xliff:g>\" הרשאה להגדרת חיבור VPN. גם אפליקציה זו יכולה לעקוב אחר הפעילות שלך ברשת."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"מכשיר זה מנוהל על ידי:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nמנהל המערכת שלך יכול לעקוב אחר הפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות, ואתרים מאובטחים. למידע נוסף, צור קשר עם מנהל המערכת שלך.\n\nכמו כן, אתה מחובר ל-VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). גם ספק שירות ה-VPN שלך יכול לעקוב אחר הפעילות שלך ברשת."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index d28aa50d..fadc94f 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"通知を消去"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"リストから削除"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"アプリ情報"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"最近使ったアプリはありません"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"最近使ったアプリをクリア"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"最近使ったアプリ: 1"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"戻る"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ホーム"</string>
<string name="accessibility_menu" msgid="316839303324695949">"メニュー"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"最近使ったアプリ"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"検索"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"カメラ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"電話"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"通知が削除されました。"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"通知シェード"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"クイック設定"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"最近使ったアプリです。"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ユーザー: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>、<xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"モバイル: <xliff:g id="SIGNAL">%1$s</xliff:g>、<xliff:g id="TYPE">%2$s</xliff:g>、<xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"パネルを閉じる"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"長くする"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"短くする"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G～3Gデータが無効になりました"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4Gデータが無効になりました"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"モバイルデータが無効になりました"</string>
@@ -181,8 +187,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"GPSにより現在地が設定されました"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"現在地リクエストがアクティブ"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"通知をすべて消去。"</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"設定"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"画面は自動的に回転します。"</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"画面は横向きにロックされています。"</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"画面は縦向きにロックされています。"</string>
@@ -241,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g>使用中"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"警告: 上限は<xliff:g id="DATA_LIMIT">%s</xliff:g>です"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"最近使ったアプリはありません"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"アプリ情報"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"アプリロック"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"検索"</string>
@@ -261,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g>のアラームは鳴りません"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"緊急度の低い通知を下に表示"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"開くにはもう一度タップしてください"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"ロック解除するには上にスワイプしてください"</string>
<string name="phone_hint" msgid="3101468054914424646">"右にスワイプして電話を表示"</string>
<string name="camera_hint" msgid="5241441720959174226">"左にスワイプしてカメラを表示"</string>
@@ -270,19 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"重要"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"すべて"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"充電中（フル充電まで<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>）"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"ユーザーを追加"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"新しいユーザー"</string>
<string name="guest_nickname" msgid="8059989128963789678">"ゲスト"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ゲスト"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ゲストを終了"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"ゲストを削除"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ゲストセッションを終了しますか？"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ゲストセッションを終了すると、ローカルデータが削除されます。"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"おかえりなさい、ゲストさん"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"新しいセッションを開始しますか？"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"はい"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"いいえ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1分"</item>
<item quantity="other" msgid="6924190729213550991">"%d分"</item>
@@ -307,12 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"ネットワーク監視"</string>
<string name="open_app" msgid="4011771120339160755">"アプリを開く"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"VPNを切断"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
- <skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"この端末は<xliff:g id="ORGANIZATION">%1$s</xliff:g>によって管理されています。\n\n\n管理者はあなたの端末やネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。\n\n詳しくは管理者にお問い合わせください。"</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」にVPN接続のセットアップを許可しました。\n\nこのアプリはあなたの端末やネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。"</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN（「<xliff:g id="APPLICATION">%1$s</xliff:g>」）に接続しています。\n\nVPNサービスプロバイダはあなたの端末やネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"この端末は<xliff:g id="ORGANIZATION">%1$s</xliff:g>によって管理されています。\n\n\n管理者はあなたのネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。詳しくは管理者にお問い合わせください。\n\nまた、「<xliff:g id="APPLICATION">%2$s</xliff:g>」にVPN接続のセットアップを許可しています。このアプリもネットワークアクティビティを監視できます。"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"この端末は<xliff:g id="ORGANIZATION">%1$s</xliff:g>によって管理されています。\n\n\n管理者はあなたのネットワークアクティビティ（メール、アプリ、保護されたウェブサイトなど）を監視できます。詳しくは管理者にお問い合わせください。\n\nまた、VPN（「<xliff:g id="APPLICATION">%2$s</xliff:g>」）に接続しています。VPNサービスプロバイダーもネットワークアクティビティを監視できます。"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml
index 8fc5c4f..86d6116 100644
--- a/packages/SystemUI/res/values-ka-rGE/strings.xml
+++ b/packages/SystemUI/res/values-ka-rGE/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"გასუფთავება"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"სიიდან ამოშლა"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"აპის შესახებ"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ბოლოს გამოყენებული აპების სია ცარიელია"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ბოლო აპების გაუქმება"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ბოლო აპი"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"უკან"</string>
<string name="accessibility_home" msgid="8217216074895377641">"საწყისი"</string>
<string name="accessibility_menu" msgid="316839303324695949">"მენიუ"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"ბოლოს გამოყენებული აპები"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ძიება"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"კამერა"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ტელეფონი"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"შეტყობინება წაიშალა."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"შეტყობინებების ფარდა"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"სწრაფი პარამეტრები"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"ბოლო აპები."</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"მომხმარებელი: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"მობილურის <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"არეს დახურვა"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"მეტი დრო"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"ნაკლები დრო"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G მონაც. გადაცემა გამორთულია"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G მონაც. გადაცემა გამორთულია"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ფიჭური ინტერნეტი გამორთულია"</string>
@@ -238,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"გამოყენებულია: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ლიმიტი: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> გაფრთხილება"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ბოლო აპები არ არის"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"აპლიკაციის შესახებ"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"აპზე ფიქსაცია"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ძიება"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"თქვენს მაღვიძარას <xliff:g id="ALARM_TIME">%s</xliff:g>-ზე ვერ გაიგონებთ"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ქვემოთ მითითებულია ნაკლებად სასწრაფო შეტყობინებები"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"შეეხეთ ისევ გასახსნელად"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"გაასრიალეთ ზევით განსაბლოკად"</string>
<string name="phone_hint" msgid="3101468054914424646">"გადაფურცლეთ მარჯვნივ ტელეფონისთვის"</string>
<string name="camera_hint" msgid="5241441720959174226">"კამერისთვის მარცხენა შენაცვლება"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"პრიორიტეტი"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ყველა"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>-ის შეცვლა დასრულებამდე)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"მომხმარებლის დამატება"</string>
<string name="user_new_user_name" msgid="426540612051178753">"ახალი მომხმარებელი"</string>
<string name="guest_nickname" msgid="8059989128963789678">"სტუმარი"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ სტუმარი"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"სტუმრის გასვლა"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"გსურთ სტუმრის სესიიდან გამოსვლა?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"სტუმრის სესიიდან გამოსვლით ლოკალური მონაცემები ამოიშლება."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"სტუმარო, გვიხარია, რომ დაბრუნდით!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"გსურთ, ახალი სესიის დაწყება?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"კი"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"არა, გმადლობთ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ერთი წუთით"</item>
<item quantity="other" msgid="6924190729213550991">"%d წუთით"</item>
@@ -307,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"თქვენ დაკავშირებული ხართ VPN-თან („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nთქვენი VPN სერვისის პროვაიდერს შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ამ მოწყობილობის მმართველია:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nთქვენს ადმინისტრატორს შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების. დამატებითი ინფორმაციისათვის, დაუკავშირდით თქვენს ადმინისტრატორს.\n\nთქვენ მიეცით ნებართვა „<xliff:g id="APPLICATION">%2$s</xliff:g>“-ს დააყენოს VPN კავშირი. ამ აპს შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ამ მოწყობილობის მმართველი არის:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nთქვენს ადმინისტრატორს შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო საიტების. დამატებითი ინფორმაციისათვის, დაუკავშირდით თქვენს ადმინისტრატორს.\n\nასევე, თქვენ დაკავშირებული ხართ VPN-თან („<xliff:g id="APPLICATION">%2$s</xliff:g>“). თქვენს VPN სერვისის პროვაიდერს ასევე შეუძლია თქვენი ქსელის აქტივობის მონიტორინგი."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml
index da91a41..18af59d 100644
--- a/packages/SystemUI/res/values-kk-rKZ/strings.xml
+++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Тазалау"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Тізімнен алу"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Қолданба ақпараты"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Жуықта қолданылған қолданбалар жоқ"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Жуықта қолданылған қолданбаларды қоспау"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 жуықта қолданылған қолданба"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Артқа"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Үй"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Mәзір"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Жуықта қолданылған қолданбалар"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Іздеу"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Хабар алынып тасталды."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Хабарландыру тақтасы"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Жылдам параметрлер."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Соңғы қолданбалар."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Параметрлер"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Пайдаланушы <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Ұялы <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Тақтаны жабу"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Көбірек уақыт"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Азырақ уақыт"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G деректері өшірулі"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G деректері өшірулі"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Ұялы деректер өшірулі"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> пайдаланылған"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> шегі"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> туралы ескерту"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Жақындағы қолданбалар жоқ"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Қолданба туралы ақпарат"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"қолданбаға бекіту"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"іздеу"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> уақытында дабылды естімейсіз"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Шұғылдығы азырақ хабарландырулар төменде"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ашу үшін қайта түртіңіз"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Бекітпесін ашу үшін жанаңыз"</string>
<string name="phone_hint" msgid="3101468054914424646">"Телефон үшін оңға жанаңыз"</string>
<string name="camera_hint" msgid="5241441720959174226">"Камера үшін солға жанаңыз"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Басымдық"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Барлығы"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Зарядталуда (толғанша <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Пайдаланушы қосу"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Жаңа пайдаланушы"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Қонақ"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Қонақ"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Қонақтан шығу"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Қонақты жою"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Қонақ сеансынан шығып жатырсыз ба?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Қонақ сеансынан шығу жергілікті деректерді жояды."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Қош келдіңіз, қонақ"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Жаңа сеанс бастау керек пе?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Иә"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Жоқ, рақмет"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Бір минут бойы"</item>
<item quantity="other" msgid="6924190729213550991">"%d минут бойы"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Сіз VPN («<xliff:g id="APPLICATION">%1$s</xliff:g>») желісіне қосылғансыз.\n\nVPN қызмет жеткізушісі құрылғыңызды және желілік белсенділікті, соның ішінде, электрондық хабарларды, қолданбаларды және қорғалған веб-сайттарды бақылауы мүмкін."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Бұл құр. келесі ұйым бас.:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nӘкімші желілік белсенділікті, соның ішінде, электрондық хаб-ды, қолд-ды және қорғалған веб-сайттарды бақ. мүмкін. Қосымша ақпарат алу үшін әкімшіге хабарласыңыз.\n\nСондай-ақ, сіз «<xliff:g id="APPLICATION">%2$s</xliff:g>» қолд-на VPN байланысын орнатуға рұқсат еттіңіз. Бұл қолд. да желілік белс-ті бақылауы мүмкін."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Бұл құрылғыны келесі ұйым басқарады:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nӘкімші желілік белсенділікті, соның ішінде, электрондық хабарларды, қолданбаларды және қорғалған веб-сайттарды бақылауы мүмкін. Қосымша ақпарат алу үшін әкімшіге хабарласыңыз.\n\nСондай-ақ, сіз VPN («<xliff:g id="APPLICATION">%2$s</xliff:g>») желісіне қосылғансыз. VPN қызмет жет-сі де жел. белс-ті бақ. мүм."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml
index bae73d3..5ca2339 100644
--- a/packages/SystemUI/res/values-km-rKH/strings.xml
+++ b/packages/SystemUI/res/values-km-rKH/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"សម្អាត"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"យកចេញពីបញ្ជី"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ព័ត៌មានកម្មវិធី"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"គ្មានកម្មវិធីថ្មីៗ"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"បដិសេធកម្មវិធីថ្មីៗ"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"កម្មវិធីថ្មី ១"</item>
@@ -69,7 +70,7 @@
<string name="screenshot_saving_ticker" msgid="7403652894056693515">"កំពុងរក្សាទុករូបថតអេក្រង់…"</string>
<string name="screenshot_saving_title" msgid="8242282144535555697">"កំពុងរក្សាទុករូបថតអេក្រង់..."</string>
<string name="screenshot_saving_text" msgid="2419718443411738818">"រូបថតអេក្រង់កំពុងត្រូវបានរក្សាទុក។"</string>
- <string name="screenshot_saved_title" msgid="6461865960961414961">"បានចាប់យករូបថតអេក្រង់។"</string>
+ <string name="screenshot_saved_title" msgid="6461865960961414961">"បានចាប់យករូបថតអេក្រង់។"</string>
<string name="screenshot_saved_text" msgid="1152839647677558815">"ប៉ះ ដើម្បីមើលរូបថតអេក្រង់របស់អ្នក។"</string>
<string name="screenshot_failed_title" msgid="705781116746922771">"មិនអាចចាប់យករូបថតអេក្រង់។"</string>
<string name="screenshot_failed_text" msgid="1260203058661337274">"មិនអាចថតអេក្រង់ដោយសារតែទំហំផ្ទុកមានដែនកំណត់ ឬវាមិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី ឬស្ថាប័នរបស់អ្នក។"</string>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"ថយក្រោយ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"គេហទំព័រ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"ម៉ឺនុយ"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"កម្មវិធីថ្មីៗ"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ស្វែងរក"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ម៉ាស៊ីនថត"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ទូរស័ព្ទ"</string>
@@ -146,7 +148,7 @@
<string name="accessibility_remove_notification" msgid="3603099514902182350">"សម្អាតការជូនដំណឹង។"</string>
<string name="accessibility_gps_enabled" msgid="3511469499240123019">"បានបើក GPS ។"</string>
<string name="accessibility_gps_acquiring" msgid="8959333351058967158">"ទទួល GPS ។"</string>
- <string name="accessibility_tty_enabled" msgid="4613200365379426561">"បានបើកម៉ាស៊ីនអង្គុលីលេខ"</string>
+ <string name="accessibility_tty_enabled" msgid="4613200365379426561">"បានបើកម៉ាស៊ីនអង្គុលីលេខ"</string>
<string name="accessibility_ringer_vibrate" msgid="666585363364155055">"កម្មវិធីរោទ៍ញ័រ។"</string>
<string name="accessibility_ringer_silent" msgid="9061243307939135383">"កម្មវិធីរោទ៍ស្ងាត់។"</string>
<string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"បោះបង់ <xliff:g id="APP">%s</xliff:g> ។"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"បានបដិសេធការជូនដំណឹង"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"ពណ៌ការជូនដំណឹង"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ការកំណត់រហ័ស។"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"កម្មវិធីថ្មីៗ។"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"អ្នកប្រើ <xliff:g id="USER">%s</xliff:g> ។"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"ចល័ត <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"បិទបន្ទះ"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"ពេលច្រើនជាង"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"ពេលតិចជាង"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"ទិន្នន័យ 2G-3G បានបិទ"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"ទិន្នន័យ 4G បានបិទ"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ទិន្នន័យចល័តបានបិទ"</string>
@@ -199,7 +206,7 @@
<string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"បញ្ឈរ"</string>
<string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"ទេសភាព"</string>
<string name="quick_settings_ime_label" msgid="7073463064369468429">"វិធីសាស្ត្របញ្ចូល"</string>
- <string name="quick_settings_location_label" msgid="5011327048748762257">"ទីតាំង"</string>
+ <string name="quick_settings_location_label" msgid="5011327048748762257">"ទីតាំង"</string>
<string name="quick_settings_location_off_label" msgid="7464544086507331459">"ទីតាំងបានបិទ"</string>
<string name="quick_settings_media_device_label" msgid="1302906836372603762">"ឧបករណ៍មេឌៀ"</string>
<string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string>
@@ -238,15 +245,16 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"បានប្រើ <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ដែនកំណត់ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ការព្រមាន"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"មិនមានកម្មវិធីថ្មីៗ"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ព័ត៌មានកម្មវិធី"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"ចាក់សោទៅកម្មវិធី"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string>
- <string name="expanded_header_battery_charged" msgid="5945855970267657951">"បានបញ្ចូលថ្ម"</string>
+ <string name="expanded_header_battery_charged" msgid="5945855970267657951">"បានបញ្ចូលថ្ម"</string>
<string name="expanded_header_battery_charging" msgid="205623198487189724">"កំពុងបញ្ចូលថ្ម"</string>
<string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> រហូតដល់ពេញ"</string>
<string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"មិនកំពុងបញ្ចូលថ្ម"</string>
- <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"បណ្ដាញអាច\nត្រូវបានត្រួតពិនិត្យ"</string>
+ <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"បណ្ដាញអាច\nត្រូវបានត្រួតពិនិត្យ"</string>
<string name="description_target_search" msgid="3091587249776033139">"ស្វែងរក"</string>
<string name="description_direction_up" msgid="7169032478259485180">"រុញឡើងលើដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
<string name="description_direction_left" msgid="7207478719805562165">"រុញទៅឆ្វេងដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"អ្នកនឹងមិនឮការជូនដំណឹងរបស់អ្នកនៅម៉ោង <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ការជូនដំណឹងមិនសូវបន្ទាន់ខាងក្រោម"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"ប៉ះម្ដងទៀត ដើម្បីបើក"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"អូសឡើងលើ ដើម្បីដោះសោ"</string>
<string name="phone_hint" msgid="3101468054914424646">"អូសទៅស្ដាំដើម្បីបើកទូរស័ព្ទ"</string>
<string name="camera_hint" msgid="5241441720959174226">"អូសទៅឆ្វេងដើម្បីប្រើម៉ាស៊ីនថត"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"អាទិភាព"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ទាំងអស់"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"កំពុងបញ្ចូលថ្ម (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ទើបពេញ)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"បន្ថែមអ្នកប្រើ"</string>
<string name="user_new_user_name" msgid="426540612051178753">"អ្នកប្រើថ្មី"</string>
<string name="guest_nickname" msgid="8059989128963789678">"ភ្ញៀវ"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ភ្ញៀវ"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ភ្ញៀវចាកចេញ"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ចេញពីសម័យភ្ញៀវ?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ការចេញពីសម័យភ្ញៀវនឹងលុបទិន្នន័យមូលដ្ឋាន។"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"សូមស្វាគមន៍ការត្រឡប់មកវិញ, ភ្ញៀវ!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"តើអ្នកចង់ចាប់ផ្ដើមសម័យថ្មី?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"បាទ/ចាស"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"ទេ, អរគុណ!"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"សម្រាប់មួយនាទី"</item>
<item quantity="other" msgid="6924190729213550991">"សម្រាប់ %d នាទី"</item>
@@ -304,7 +322,9 @@
<string name="disconnect_vpn" msgid="1324915059568548655">"ផ្ដាច់ VPN"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"ឧបករណ៍នេះត្រូវបានគ្រប់គ្រងដោយ៖\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nអ្នកគ្រប់គ្រងរបស់អ្នកអាចពិនិត្យឧបករណ៍ និងសកម្មភាពបណ្ដាញរបស់អ្នករួមមាន អ៊ីមែល, កម្មវិធី និងតំបន់បណ្ដាញមានសុវត្ថិភាព។\n\nចំពោះព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។"</string>
<string name="monitoring_description_vpn" msgid="7288268682714305659">"អ្នកបានផ្ដល់សិទ្ធិ \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" ដើម្បីរៀបចំការភ្ជាប់ VPN ។\n\nកម្មវិធីនេះអាចពិនិត្យឧបករណ៍ និងសកម្មភាពបណ្ដាញរបស់អ្នករួមមាន អ៊ីមែល, កម្មវិធី និងតំបន់បណ្ដាញមានសុវត្ថិភាព។"</string>
- <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"អ្នកត្រូវបានភ្ជាប់ទៅ VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\")។\n\nក្រុមហ៊ុនផ្ដល់សេវាកម្ម VPN របស់អ្នកអាចពិនិត្យឧបករណ៍ និងសកម្មភាពបណ្ដាញរបស់អ្នករួមមាន អ៊ីមែល, កម្មវិធី និងតំបន់បណ្ដាញមានសុវត្ថិភាព។"</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"អ្នកបានភ្ជាប់ទៅ VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\")។\n\nក្រុមហ៊ុនផ្ដល់សេវាកម្ម VPN របស់អ្នកអាចពិនិត្យឧបករណ៍ និងសកម្មភាពបណ្ដាញរបស់អ្នករួមមាន អ៊ីមែល, កម្មវិធី និងតំបន់បណ្ដាញមានសុវត្ថិភាព។"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ឧបករណ៍នេះត្រូវបានគ្រប់គ្រងដោយ \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n អ្នកគ្រប់គ្រងរបស់អ្នកមានសមត្ថភាពក្នុងការត្រួតពិនិត្យសកម្មភាពបណ្ដាញរបស់អ្នក រួមមានអ៊ីមែល, កម្មវិធី, និងតំបន់បណ្ដាញសុវត្ថិភាព។ សម្រាប់ព័ត៌មានបន្ថែមសូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។ \n\n អ្នកបានផ្ដល់សិទ្ធិ\"<xliff:g id="APPLICATION">%2$s</xliff:g>\" ដើម្បីរៀបចំការតភ្ជាប់ VPN ។ កម្មវិធីនេះអាចតាមដានសកម្មភាពបណ្ដាញ។"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ឧបករណ៍នេះត្រូវបានគ្រប់គ្រងដោយ \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n អ្នកគ្រប់គ្រងរបស់អ្នកមានសមត្ថភាពក្នុងការត្រួតពិនិត្យសកម្មភាពបណ្ដាញរបស់អ្នករួមមានអ៊ីមែល, កម្មវិធី និងតំបន់បណ្ដាញសុវត្ថិភាព។ សម្រាប់ព័ត៌មានបន្ថែមសូមទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។ \n\n អ្នកត្រូវបានតភ្ជាប់ទៅ VPN (\" <xliff:g id="APPLICATION">%2$s</xliff:g> \") ។ ក្រុមហ៊ុនផ្ដល់សេវា VPN របស់អ្នកអាចតាមដានសកម្មភាពរបស់អ្នក។"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml
index 272c1b1..45d32b2 100644
--- a/packages/SystemUI/res/values-kn-rIN/strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"ತೆರವುಮಾಡು"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಲ್ಲ"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ವಜಾಗೊಳಿಸು"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"ಹಿಂದೆ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ಮುಖಪುಟ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"ಮೆನು"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ಹುಡುಕು"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ಕ್ಯಾಮರಾ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ಫೋನ್"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"ಅಧಿಸೂಚನೆ ವಜಾಗೊಂಡಿದೆ."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"ಅಧಿಸೂಚನೆಯ ಛಾಯೆ."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳು."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ಬಳಕೆದಾರ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"ಮೊಬೈಲ್ <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ಫಲಕವನ್ನು ಮುಚ್ಚು"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"ಹೆಚ್ಚು ಸಮಯ"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"ಕಡಿಮೆ ಸಮಯ"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G ಡೇಟಾ ಆಫ್ ಆಗಿದೆ"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G ಡೇಟಾ ಆಫ್ ಆಗಿದೆ"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಆಫ್ ಆಗಿದೆ"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಮಿತಿ"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಎಚ್ಚರಿಕೆ"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಲ್ಲ"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"ಅಪ್ಲಿಕೇಶನ್ಗೆ ಲಾಕ್"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> ಗೆ ನೀವು ನಿಮ್ಮ ಅಲಾರಂ ಆಲಿಸುವುದಿಲ್ಲ"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ಕೆಳಗೆ ಕಡಿಮೆ ಅವಸರದ ಅಧಿಸೂಚನೆಗಳು"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"ತೆರೆಯಲು ಮತ್ತೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="phone_hint" msgid="3101468054914424646">"ಫೋನ್ಗಾಗಿ ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="camera_hint" msgid="5241441720959174226">"ಕ್ಯಾಮರಾಗಾಗಿ ಎಡಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ಆದ್ಯತೆ"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ಎಲ್ಲ"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ ( ಪೂರ್ತಿ ಆಗುವವರೆಗೆ <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
<string name="user_new_user_name" msgid="426540612051178753">"ಹೊಸ ಬಳಕೆದಾರರು"</string>
<string name="guest_nickname" msgid="8059989128963789678">"ಅತಿಥಿ"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ಅತಿಥಿ"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ಅತಿಥಿ ಅನ್ನು ನಿರ್ಗಮಿಸಿ"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"ಅತಿಥಿಯನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ಅತಿಥಿ ಅವಧಿಯನ್ನು ನಿರ್ಗಮಿಸಬೇಕೆ?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ಅತಿಥಿ ಅವಧಿಯಿಂದ ನಿರ್ಗಮಿಸುವುದರಿಂದ ಸ್ಥಳೀಯ ಡೇಟಾವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುವುದು."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"ಮತ್ತೆ ಸುಸ್ವಾಗತ, ಅತಿಥಿ!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"ನೀವು ಹೊಸ ಅವಧಿಯನ್ನು ಆರಂಭಿಸಲು ಬಯಸುವಿರಾ?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ಹೌದು"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ಒಂದು ನಿಮಿಷದವರೆಗೆ"</item>
<item quantity="other" msgid="6924190729213550991">"%d ನಿಮಿಷಗಳವರೆಗೆ"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"ನೀವು VPN ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಿರಿ (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nನಿಮ್ಮ VPN ಸೇವೆ ಒದಗಿಸುವವರು ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ಸುರಕ್ಷಿತ ವೆಬ್ಸೈಟ್ಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ಇವರು ಈ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸುತ್ತಾರೆ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು, ಮತ್ತು ಸುರಕ್ಷಿತ ವೆಬ್ಸೈಟ್ಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.\n\nಅಲ್ಲದೇ, ನೀವು VPN ಸಂಪರ್ಕ ಹೊಂದಿಸಲು \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" ಗೆ ಅನುಮತಿ ನೀಡಿರುವಿರಿ. ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಸಹ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ಇವರು ಈ ಸಾಧನವನ್ನು ಇವರು ನಿರ್ವಹಿಸುತ್ತಾರೆ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು, ಮತ್ತು ಸುರಕ್ಷಿತ ವೆಬ್ಸೈಟ್ಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.\n\nಅಲ್ಲದೇ, ನೀವು VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಿರಿ. ನಿಮ್ಮ VPN ಸೇವೆ ಒದಗಿಸುವವರು ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಸಹ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 6d2b691..fa2d05c 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"지우기"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"목록에서 삭제"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"앱 정보"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"최근에 사용한 앱 없음"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"최근에 사용한 앱 숨기기"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"최근에 사용한 앱 1개"</item>
@@ -82,7 +83,8 @@
<string name="accessibility_back" msgid="567011538994429120">"뒤로"</string>
<string name="accessibility_home" msgid="8217216074895377641">"홈"</string>
<string name="accessibility_menu" msgid="316839303324695949">"메뉴"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"최근에 사용한 앱"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"검색"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"카메라"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"전화"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"알림이 제거되었습니다."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"알림 세부정보"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"빠른 설정"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"최근 앱"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"설정"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"사용자 <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"모바일 <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"패널 닫기"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"시간 늘리기"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"시간 줄이기"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G 데이터 사용 중지됨"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G 데이터 사용 중지됨"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"이동통신 데이터 사용 중지됨"</string>
@@ -181,8 +187,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"GPS에서 위치 설정"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"위치 요청 있음"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"모든 알림 지우기"</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"설정"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"화면이 자동으로 회전됩니다."</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"화면이 가로 방향으로 잠겨 있습니다."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"화면이 세로 방향으로 잠겨 있습니다."</string>
@@ -241,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> 사용됨"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"한도: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 경고"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"최근에 사용한 앱 없음"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"애플리케이션 정보"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"앱에 잠금"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"검색"</string>
@@ -261,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g>에 알람을 들을 수 없습니다."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"아래에 덜 급한 알림 표시"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"다시 탭하여 열기"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"위로 스와이프하여 잠금 해제"</string>
<string name="phone_hint" msgid="3101468054914424646">"전화 기능을 사용하려면 오른쪽으로 스와이프하세요."</string>
<string name="camera_hint" msgid="5241441720959174226">"카메라를 사용하려면 왼쪽으로 스와이프하세요."</string>
@@ -270,19 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"최우선만 수신"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"모두 수신"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"충전 중(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> 후 충전 완료)"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"사용자 추가"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"새 사용자"</string>
<string name="guest_nickname" msgid="8059989128963789678">"손님"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"새 손님 추가"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"손님 모드 종료"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"손님 삭제"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"손님 세션을 종료하시겠습니까?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"손님 세션을 종료하면 로컬 데이터가 삭제됩니다."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"손님 세션 다시 시작"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"새로운 세션을 시작하시겠습니까?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"예"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"아니요"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1분 동안"</item>
<item quantity="other" msgid="6924190729213550991">"%d분 동안"</item>
@@ -307,12 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"네트워크 모니터링"</string>
<string name="open_app" msgid="4011771120339160755">"앱 열기"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"VPN 연결 해제"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"이 기기는 \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n에서 관리합니다. 관리자가 이메일, 앱 및 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다.\n\n자세한 내용은 관리자에게 문의하세요."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"\'<xliff:g id="APPLICATION">%1$s</xliff:g>\'에 VPN 연결을 설정할 수 있는 권한을 부여했습니다.\n\n이 앱에서 내 기기와 이메일과 앱, 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN(\'<xliff:g id="APPLICATION">%1$s</xliff:g>\')에 연결되었습니다.\n\nVPN 서비스 제공업체에서 내 기기와 이메일, 앱, 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다."</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"이 기기는 \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>에서 관리합니다.\n\n관리자가 이메일, 앱, 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다. 자세한 정보는 관리자에게 문의하세요.\n\n또한 \'<xliff:g id="APPLICATION">%2$s</xliff:g>\'에 VPN 연결을 설정할 수 있는 권한을 부여했습니다. 이 앱에서도 네트워크 활동을 모니터링할 수 있습니다."</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"이 기기는 \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>에서 관리합니다.\n\n관리자가 이메일, 앱, 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다. 자세한 정보는 관리자에게 문의하세요.\n\n또한 VPN에도 연결되었습니다(\'<xliff:g id="APPLICATION">%2$s</xliff:g>\'). VPN 서비스 제공업체에서도 네트워크 활동을 모니터링할 수 있습니다."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
<skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"이 기기는 \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n에서 관리합니다. 관리자가 이메일, 앱 및 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다. 자세한 정보는 관리자에게 문의하세요.\n\n또한 \'<xliff:g id="APPLICATION">%2$s</xliff:g>\'에 VPN 연결을 설정할 수 있는 권한을 부여했습니다. 이 앱에서도 네트워크 활동을 모니터링할 수 있습니다."</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"이 기기는 \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n에서 관리합니다. 관리자가 이메일, 앱 및 보안 웹사이트 등의 네트워크 활동을 모니터링할 수 있습니다. 자세한 정보는 관리자에게 문의하세요.\n\n또한 VPN에도 연결되었습니다(\'<xliff:g id="APPLICATION">%2$s</xliff:g>\'). VPN 서비스 제공업체에서도 네트워크 활동을 모니터링할 수 있습니다."</string>
</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml
index ed9f69f..d3fc508 100644
--- a/packages/SystemUI/res/values-ky-rKG/strings.xml
+++ b/packages/SystemUI/res/values-ky-rKG/strings.xml
@@ -25,7 +25,8 @@
<skip />
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Тизмеден алып салуу"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Колдонмо тууралуу"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Акыркы колдонмолор табылган жок"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Акыркы колдонмолорду жок кылуу"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 акыркы колдонмо"</item>
@@ -106,7 +107,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Артка"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Үйгө"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Меню"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Акыркы колдонмолор"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Издөө"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string>
@@ -181,7 +183,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Эскертме жок кылынды."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Эскертмелер көшөгөсү."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Тез тууралоолор."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Акыркы колдонмолор."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Жөндөөлөр"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Колдонуучу <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобилдик түйүн <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -193,6 +197,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Тактаны жабуу"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Көбүрөөк убакыт"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Азыраак убакыт"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2Гб-3Гб көлөмдөгү дайындар өчүрүлдү."</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4Гб көлөмдөгү дайындар өчүрүлдү"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Уюктук дайындар тармагы өчүк"</string>
@@ -264,7 +270,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> колдонулду"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> чектөө"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> эскертүү"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Акыркы колдонмолор жок"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Колдонмо жөнүндө маалымат"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"колдонмого кулпулоо"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"издөө"</string>
@@ -284,7 +291,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Саат <xliff:g id="ALARM_TIME">%s</xliff:g> үн ишаратын укпайсыз."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Анчейин шашылыш эмес эскертмелер төмөндө"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ачуу үчүн кайра таптап коюңуз"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Кулпуну ачуу үчүн серпип коюңуз"</string>
<string name="phone_hint" msgid="3101468054914424646">"Телефонду колдонуу үчүн оңго серпип коюңуз"</string>
<string name="camera_hint" msgid="5241441720959174226">"Камераны ачуу үчүн солго серпип коюңуз"</string>
@@ -293,17 +301,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Артыкчылыктуу"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Бардыгы"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Кубатталууда (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> толгонго чейин)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Колдонуучу кошуу"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Жаңы колдонуучу"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Конок"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Конок"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Конок режиминен чыгуу"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Конокту алып салуу"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Конок сеансынан чыгасызбы?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Конок сеансынан чыкканда, жергиликтүү дайындар өчүрүлөт."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Кайтып келишиңиз менен, конок!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Жаңы сеанс баштайсызбы?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ооба"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Жок, рахмат"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Бир мүнөткө"</item>
<item quantity="other" msgid="6924190729213550991">"%d мүнөткө"</item>
@@ -333,4 +349,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Сиз VPN-ге туташкансыз (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nVPN кызмат камсыздоочуңуз түзмөгүңүздү жана тармактагы аракетиңизди, анын ичинде email-дер, колдонмолор жана коопсуз вебсайттарды көзөмөлдөй алат."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Бул түзмөк төмөнкүчө башкарылат:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор электрондук почталар, колдонмолор жана коопсуз вебсайттар сыяктуу тармактгы аракеттрге көз салып турт. Көбүрөөк билүү үчн, администратрго кайрылңз.\n\nОшондой эле \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" VPN туташуусн орнотууга урукст бердиңз. Бул колдонмо тармактгы аракеттерңзге дагы көз салат."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Бул түзмөк төмөнкүчө башкарылат:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор электрондук почта, колдонмолор жана коопсуз вебсайттар сыяктуу тармактагы аракеттериңизге көз салып турат. Көбүрөөк билүү үчүн, администраторго кайрылыңыз.\n\nОшондой эле VPN\'ге туташып турасыз. (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). VPN кызмат көрсөтүүчү тармактагы аракетиңизге көз салат."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-land/config.xml b/packages/SystemUI/res/values-land/config.xml
index 2b1a4dc..d608e25 100644
--- a/packages/SystemUI/res/values-land/config.xml
+++ b/packages/SystemUI/res/values-land/config.xml
@@ -29,5 +29,7 @@
<!-- The number of columns that the top level tiles span in the QuickSettings -->
<integer name="quick_settings_user_time_settings_tile_span">2</integer>
-</resources>
+ <!-- We have only space for one notification on phone landscape layouts. -->
+ <integer name="keyguard_max_notification_count">1</integer>
+</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml
index 612a255..f7dfb89 100644
--- a/packages/SystemUI/res/values-lo-rLA/strings.xml
+++ b/packages/SystemUI/res/values-lo-rLA/strings.xml
@@ -23,7 +23,7 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"ລຶບ"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ເອົາອອກຈາກລາຍການ"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ຂໍ້ມູນແອັບຯ"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ບໍ່ມີແອັບຯທີ່ຫາກໍໃຊ້"</string>
+ <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Your recent screens appear here"</string>
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ປິດແອັບຯຫຼ້າສຸດທີ່ໃຊ້"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ແອັບຯຫຼ້າສຸດ"</item>
@@ -80,7 +80,7 @@
<string name="accessibility_back" msgid="567011538994429120">"ກັບຄືນ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ໜ້າທຳອິດ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"ເມນູ"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"ແອັບຯຫຼ້າສຸດ"</string>
+ <string name="accessibility_recent" msgid="1606470783629913980">"ໜ້າຈໍເມື່ອບໍ່ດົນມານີ້"</string>
<string name="accessibility_search_light" msgid="1103867596330271848">"ຊອກຫາ"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ກ້ອງ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ໂທລະສັບ"</string>
@@ -155,7 +155,8 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"ປິດການແຈ້ງເຕືອນແລ້ວ."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"ໜ້າຈໍແຈ້ງເຕືອນ."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ການຕັ້ງຄ່າດ່ວນ."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"ແອັບຯທີ່ຫາກໍໃຊ້."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ການຕັ້ງຄ່າ"</string>
+ <string name="accessibility_desc_recent_apps" msgid="8376953390514779637">"ໜ້າຈໍເມື່ອບໍ່ດົນມານີ້."</string>
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ຜູ່ໃຊ້ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"ມືຖື <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +168,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ປິດແຖບ"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"ເພີ່ມເວລາ"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"ຫຼຸດເວລາ"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"ຂໍ້ມູນ 2G-3G ແມ່ນປິດ"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"ຂໍ້ມູນ 4G ແມ່ນປິດ"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ຂໍ້ມູນມືຖືຖືກປິດ"</string>
@@ -238,7 +241,7 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"ໃຊ້ໄປແລ້ວ <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ຈຳກັດ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"ຄຳເຕືອນ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ບໍ່ມີແອັບຯທີ່ຫາກໍໃຊ້"</string>
+ <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ຂໍ້ມູນແອັບພລິເຄຊັນ"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lock to app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ຊອກຫາ"</string>
@@ -258,7 +261,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"ທ່ານຈະບໍ່ໄດ້ຍິນສຽງໂມງປຸກໃນເວລາ <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ການແຈ້ງເຕືອນທີ່ສຳຄັນໜ້ອຍກວ່າຢູ່ດ້ານລຸ່ມ"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"ແຕະອີກຄັ້ງເພື່ອເປີດ"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"ເລື່ອນຂຶ້ນເພື່ອປົດລັອກ"</string>
<string name="phone_hint" msgid="3101468054914424646">"ປັດຂວາເພື່ອໃຊ້ໂທລະສັບ"</string>
<string name="camera_hint" msgid="5241441720959174226">"ປັດຊ້າຍເພື່ອໃຊ້ກ້ອງ"</string>
@@ -267,17 +271,24 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ລະດັບຄວາມສຳຄັນ"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ທັງໝົດ"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ກຳລັງສາກໄຟ (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ກວ່າຈະເຕັມ)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"ເພີ່ມຜູ່ໃຊ້"</string>
<string name="user_new_user_name" msgid="426540612051178753">"ຜູ່ໃຊ້ໃໝ່"</string>
<string name="guest_nickname" msgid="8059989128963789678">"ແຂກ"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ແຂກ"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ອອກຈາກຜູ່ມາຢາມ"</string>
+ <string name="guest_new_guest" msgid="600537543078847803">"Add guest"</string>
+ <string name="guest_exit_guest" msgid="7187359342030096885">"ລຶບແຂກ"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ສິ້ນສຸດການນຳໃຊ້ຂອງຜູ່ຢ້ຽມຢາມບໍ່?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ການອອກຈາກເຊດຊັນຜູ່ຢ້ຽມຢາມຈະເປັນການລຶບຂໍ້ມູນໃນເຄື່ອງອອ."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"ຍິນດີຕ້ອນຮັບກັບມາ, ຜູ່ຢ້ຽມຢາມ!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"ທ່ານຕ້ອງການເລີ່ມເຊດຊັນໃໝ່ບໍ່?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ແມ່ນແລ້ວ"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"ບໍ່, ຂອບໃຈ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ເປັນເວລານຶ່ງນາທີ"</item>
<item quantity="other" msgid="6924190729213550991">"ເປັນເວລາ %d ນາທີ"</item>
@@ -307,4 +318,5 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"ທ່ານເຊື່ອມຕໍ່ຫາ VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") ແລ້ວ.\n\nຜູ່ໃຫ້ບໍລິການ VPN ຂອງທ່ານສາມາດເຝົ້າຕິດຕາມອຸປະກອນແລະການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ.\n\nອີກຢ່າງນຶ່ງ, ທ່ານມອບສິດອະນຸຍາດໃຫ້ \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" ເພື່ອຕັ້ງຄ່າການເຊື່ອມຕໍ່ VPN. ແອັບຯນີ້ສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ.\n\nນອກຈາກນັ້ນ, ທ່ານໄດ້ເຊື່ອມຕໍ່ຫາ VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). ຜູ່ໃຫ້ບໍລິການ VPN ຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ເຊັ່ນກັນ."</string>
+ <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Device will stay locked until you manually unlock"</string>
</resources>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index 79cfff2..98155d9 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Išvalyti"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Pašalinti iš sąrašo"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Programos informacija"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nėra naujausių programų"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Atsisakyti naujausių programų"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 naujausia programa"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Atgal"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Pagrindinis"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Meniu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Naujausios programos"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Ieškoti"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotoaparatas"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefonas"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Pranešimo atsisakyta."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Pranešimų gaubtas."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Spartieji nustatymai."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Naujausios programos."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Nustatymai"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Naudotojas <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobilusis ryšys <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Uždaryti skydelį"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Daugiau laiko"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mažiau laiko"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G–3G duomenys išjungti"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G duomenys išjungti"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobiliojo ryšio duomenys išjungti"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Išnaudota: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limitas: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> įspėjimas"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nėra naujausių programų"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Programos informacija"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Programos užrakinimo funkcija"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"paieška"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> signalo negirdėsite"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Mažiau skubūs pranešimai toliau"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Palieskite dar kartą, kad atidarytumėte"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Perbraukite aukštyn, kad atrakintumėte"</string>
<string name="phone_hint" msgid="3101468054914424646">"Perbraukite į dešinę, kad galėtumėte skambinti"</string>
<string name="camera_hint" msgid="5241441720959174226">"Perbraukite į kairę, kad būtų įjungtas fotoaparatas"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritetas"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Visi"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Kraunama (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> iki visiško įkrovimo)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Naudotojo pridėjimas"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Naujas naudotojas"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Svečias"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Svečias"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Išeiti iš svečio režimo"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Pašalinti svečią"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Išeinate iš svečio sesijos?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Išėjus iš svečio sesijos bus pašalinti vietiniai duomenys."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Sveiki sugrįžę, svety!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Ar norite pradėti naują sesiją?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Taip"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ne, ačiū"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 min."</item>
<item quantity="other" msgid="6924190729213550991">"%d min."</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Esate prisijungę prie VPN („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nVPN paslaugos teikėjas gali stebėti įrenginį ir tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Šį įrenginį tvarko:\n„<xliff:g id="ORGANIZATION">%1$s</xliff:g>“\n\nAdministratorius gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines. Kad gautumėte daugiau informacijos, susisiekite su administratoriumi.\n\nSuteikėte leidimą „<xliff:g id="APPLICATION">%2$s</xliff:g>“ užmegzti VPN ryšį. Ši programa taip pat gali stebėti tinklo veiklą."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Šį įrenginį tvarko:\n„<xliff:g id="ORGANIZATION">%1$s</xliff:g>“\n\nAdministratorius gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir saugias svetaines. Kad gautumėte daugiau informacijos, susisiekite su administratoriumi.\n\nBe to, esate prisijungę prie VPN („<xliff:g id="APPLICATION">%2$s</xliff:g>“). VPN paslaugos teikėjas taip pat gali stebėti tinklo veiklą."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 190f22a..387b850 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Notīrīt"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Noņemšana no saraksta"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Lietotnes informācija"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nav nesen izmantotu lietotņu."</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Nerādīt nesen izmantotās lietotnes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 nesen izmantotā lietotne"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Atpakaļ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Sākums"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Izvēlne"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nesen izmantotās lietotnes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Meklēt"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Tālruņa numurs"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Paziņojums netiek rādīts."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Paziņojumu panelis"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Ātrie iestatījumi"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Pēdējās izmantotās lietotnes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Iestatījumi"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Lietotājs: <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobilo sakaru tīkls. <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Aizvērt paneli"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Ilgāk"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mazāks laiks"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G–3G dati ir atslēgti"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G dati ir atslēgti"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobilie dati ir atslēgti"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Tiek izmantots: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ierobežojums: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> brīdinājums"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nav nesen izmantotu lietotņu"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informācija par lietojumprogrammu"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"fiksēt lietotni"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Meklēt"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Jūs nedzirdēsiet iestatīto signālu: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Mazāk steidzami paziņojumi tiek rādīti tālāk"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Pieskarieties vēlreiz, lai atvērtu"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Velciet uz augšu, lai atbloķētu"</string>
<string name="phone_hint" msgid="3101468054914424646">"Lai lietotu tālruni, velciet pa labi."</string>
<string name="camera_hint" msgid="5241441720959174226">"Lai lietotu kameru, velciet pa kreisi."</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritāte"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Visi"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Notiek uzlāde (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> līdz pilnīgai uzlādei)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Lietotāja pievienošana"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Jauns lietotājs"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Viesis"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+Viesis"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Iziet no viesa režīma"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Noņemt viesi"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Vai iziet no viesa sesijas?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Pārtraucot viesa sesiju, tiks noņemti lokālie dati."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Laipni lūdzam atpakaļ, viesi!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vai vēlaties sākt jaunu sesiju?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Jā"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nē, paldies"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Vienu minūti"</item>
<item quantity="other" msgid="6924190729213550991">"%d min"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Ir izveidots savienojums ar VPN tīklu (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nJūsu VPN pakalpojumu sniedzējs var pārraudzīt jūsu ierīcē un tīklā veiktās darbības, tostarp e-pastu, lietotnes un drošās vietnes."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Šo ierīci pārvalda:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJūsu administrators var pārraudzīt tīklā veiktās darbības, arī e-pastus, lietotnes un drošās vietnes. Lai uzzinātu vairāk, sazinieties ar administratoru.\n\nJūs arī piešķīrāt atļauju izveidot savienojumu ar VPN tīklu lietotnei “<xliff:g id="APPLICATION">%2$s</xliff:g>”. Šī lietotne arī var pārraudzīt jūsu tīklā veiktās darbības."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Šo ierīci pārvalda:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nJūsu administrators var pārraudzīt jūsu tīklā veiktās darbības, arī e-pastus, lietotnes un drošās vietnes. Lai uzzinātu vairāk, sazinieties ar administratoru.\n\nIr arī izveidots savienojums ar VPN tīklu (“<xliff:g id="APPLICATION">%2$s</xliff:g>”). Tīklā veiktās darbības var pārraudzīt arī jūsu VPN pakalpojumu sniedzējs."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml
index 0f1712d..6f41457 100644
--- a/packages/SystemUI/res/values-mk-rMK/strings.xml
+++ b/packages/SystemUI/res/values-mk-rMK/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Исчисти"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Отстрани од списокот"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Информации за апликацијата"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Нема скорешни апликации"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Отфрли ги скорешните апликации"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 скорешна апликација"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Назад"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Почетна страница"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Мени"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Скорешни апликации"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Пребарај"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Фотоапарат"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Известувањето е отфрлено."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Панел за известување"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Брзи подесувања."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Неодамнешни апликации."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Поставки"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Корисник <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобилен <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Затвори ја плочата"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Повеќе време"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Помалку време"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Податоците 2G-3G се исклучени"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Податоците 4G се исклучени"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Мобилните податоци се исклучени"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Искористено: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Лимит: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупредување за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Нема неодамнешни апликации"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информации за апликацијата"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"заклучи на апликација"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пребарај"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Нема да го слушнете алармот во <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Долу се помалку итни известувања"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Допрете повторно за да се отвори"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Повлечете за да се отклучи"</string>
<string name="phone_hint" msgid="3101468054914424646">"Повлечете надесно за телефон"</string>
<string name="camera_hint" msgid="5241441720959174226">"Повлечете налево за камера"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Приоритет"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Сѐ"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Се полни (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> додека не се наполни)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Додај корисник"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Нов корисник"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Гостин"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ гостин"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Излези како гостин"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Отстрани гостин"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Да излеземе од гостинската сесија?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Излегувањето од гостинската сесија ќе ги отстрани локалните податоци."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Добредојде назад, гостине!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Дали сакате да започнете нова сесија?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Да"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Не, фала"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"За една минута"</item>
<item quantity="other" msgid="6924190729213550991">"За %d минути"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Поврзани сте на ВПН („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nОператорот на услугата ВПН може да ги следи уредот и мрежната активност, заедно со е-пораките, апликациите и безбедните веб-локации."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Уредот е управуван од:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n}Администраторот е во состојба да ја следи вашата активност на мрежата, вклучувајќи ги е-пораките, апликациите и безбедните веб-локации.За повеќе информации, контактирајте со администраторот.\n\nДозволивте „<xliff:g id="APPLICATION">%2$s</xliff:g>“ да постави поврзување со ВПН.Оваа апликација може да ја следи вашата активност на мрежата исто така."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Уредот е управуван од:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистраторот е во состојба да ја следи вашата активност на мрежата, вклучувајќи ги е-пораките, апликациите и безбедните веб-локации.За повеќе информации, контактирајте со администраторот.\n\nПоврзани сте и на ВПН („<xliff:g id="APPLICATION">%2$s</xliff:g>“)Давателот на услуги на ВПН може да ја следи активноста на мрежата исто така."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml
index 2d9f40d..74ff0a8 100644
--- a/packages/SystemUI/res/values-ml-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ml-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"മായ്ക്കുക"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ലിസ്റ്റിൽ നിന്നും നീക്കംചെയ്യുക"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"അപ്ലിക്കേഷൻ വിവരം"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"സമീപകാല അപ്ലിക്കേഷനുകളൊന്നുമില്ല"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"സമീപകാല അപ്ലിക്കേഷനുകൾ നിരസിക്കുക"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"ഒരു സമീപകാല അപ്ലിക്കേഷൻ"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"മടങ്ങുക"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ഹോം"</string>
<string name="accessibility_menu" msgid="316839303324695949">"മെനു"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"സമീപകാല അപ്ലിക്കേഷനുകൾ"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"തിരയൽ"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ക്യാമറ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ഫോണ്"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"അറിയിപ്പ് നിരസിച്ചു."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"അറിയിപ്പ് ഷെയ്ഡ്."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ദ്രുത ക്രമീകരണങ്ങൾ."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"സമീപകാല അപ്ലിക്കേഷനുകൾ."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ക്രമീകരണങ്ങൾ"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ഉപയോക്താവ് <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"മൊബൈൽ <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"പാനൽ അടയ്ക്കുക"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"കൂടുതൽ സമയം"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"കുറഞ്ഞ സമയം"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G ഡാറ്റ ഓഫാണ്"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G ഡാറ്റ ഓഫാണ്"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"സെല്ലുലാർ ഡാറ്റ ഓഫാണ്"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ഉപയോഗിച്ചു"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> പരിധി"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> മുന്നറിയിപ്പ്"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"അടുത്തിടെയുള്ള അപ്ലിക്കേഷനുകളൊന്നുമില്ല"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"അപ്ലിക്കേഷൻ വിവരം"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"അപ്ലിക്കേഷനിലേക്ക് ലോക്കുചെയ്യൽ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"തിരയുക"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"നിങ്ങൾ <xliff:g id="ALARM_TIME">%s</xliff:g>-ന് അലാറം കേൾക്കില്ല"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"ആവശ്യം കുറഞ്ഞ അറിയിപ്പുകൾ ചുവടെ നൽകിയിരിക്കുന്നു"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"തുറക്കുന്നതിന് വീണ്ടും ടാപ്പുചെയ്യുക"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"അൺലോക്കുചെയ്യുന്നതിന് മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
<string name="phone_hint" msgid="3101468054914424646">"ഫോണിനായി വലതുവശത്ത് സ്വൈപ്പുചെയ്യുക"</string>
<string name="camera_hint" msgid="5241441720959174226">"ക്യാമറയ്ക്കായി ഇടതുവശത്ത് സ്വൈപ്പുചെയ്യുക"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"മുന്ഗണന"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"എല്ലാം"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ചാർജ്ജുചെയ്യുന്നു (പൂർണ്ണമാകുന്നതിന്, <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"ഉപയോക്താവിനെ ചേര്ക്കുക"</string>
<string name="user_new_user_name" msgid="426540612051178753">"പുതിയ ഉപയോക്താവ്"</string>
<string name="guest_nickname" msgid="8059989128963789678">"അതിഥി"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ അതിഥി"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"അതിഥി മോഡിൽ നിന്ന് പുറത്തുകടക്കുക"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"അതിഥിയെ നീക്കംചെയ്യുക"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"അതിഥി സെഷനിൽ നിന്ന് പുറത്തുകടക്കണോ?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"അതിഥി സെഷനിൽ നിന്ന് പുറത്തുകടക്കുന്നത് പ്രാദേശിക ഡാറ്റയെ നീക്കംചെയ്യും."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"അതിഥിയ്ക്ക് വീണ്ടും സ്വാഗതം!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"നിങ്ങൾക്ക് ഒരു പുതിയ സെഷൻ ആരംഭിക്കണോ?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ഉവ്വ്"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"വേണ്ട, നന്ദി"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ഒരു മിനിറ്റ് ദൈർഘ്യം"</item>
<item quantity="other" msgid="6924190729213550991">"%d മിനിറ്റ് ദൈർഘ്യം"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"നിങ്ങൾ VPN-ൽ (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") കണക്റ്റുചെയ്തിരിക്കുന്നു.\n\nഇമെയിലുകളും അപ്ലിക്കേഷനുകളും വെബ്സൈറ്റുകൾ സുരക്ഷിതമാക്കലും ഉൾപ്പെടെയുള്ള നെറ്റ്വർക്ക് പ്രവർത്തനങ്ങൾ നിരീക്ഷിക്കാൻ നിങ്ങളുടെ VPN സേവന ദാതാവിന് കഴിയും."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"നിങ്ങളുടെ ഉപകരണം നിയന്ത്രിക്കുന്നത് ഇതാണ്:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nനിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇമെയിലുകളും അപ്ലിക്കേഷനുകളും വെബ്സൈറ്റുകൾ സുരക്ഷിതമാക്കലും ഉൾപ്പെടെയുള്ള നിങ്ങളുടെ നെറ്റ്വർക്ക് പ്രവർത്തനങ്ങൾ നിരീക്ഷിക്കുന്നതിന് പ്രാപ്തമാണ്. കൂടുതൽ വിവരങ്ങൾക്ക് അഡ്മിനിസ്ട്രേറ്ററെ ബന്ധപ്പെടുക.\n\nഅതോടൊപ്പം, നിങ്ങൾ ഒരു VPN കണക്ഷൻ സജ്ജീകരിക്കാൻ \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" എന്നതിന് അനുമതിയും നൽകി. ഈ അപ്ലിക്കേഷന് നെറ്റ്വർക്ക് പ്രവർത്തനവും നിരീക്ഷിക്കാനാകും."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"നിങ്ങളുടെ ഉപകരണം നിയന്ത്രിക്കുന്നത് ഇതാണ്:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nനിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇമെയിലുകളും അപ്ലിക്കേഷനുകളും വെബ്സൈറ്റുകൾ സുരക്ഷിതമാക്കലും ഉൾപ്പെടെയുള്ള നിങ്ങളുടെ നെറ്റ്വർക്ക് പ്രവർത്തനങ്ങൾ നിരീക്ഷിക്കുന്നതിന് പ്രാപ്തമാണ്. കൂടുതൽ വിവരങ്ങൾക്ക് അഡ്മിനിസ്ട്രേറ്ററെ ബന്ധപ്പെടുക.\n\nഅതോടൊപ്പം, നിങ്ങൾ ഒരു VPN-ലും (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") കണക്റ്റുചെയ്തിരിക്കുന്നു. നിങ്ങളുടെ VPN സേവന ദാതാവിന് നെറ്റ്വർക്ക് പ്രവർത്തനവും നിരീക്ഷിക്കാനാകും."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml
index 2d9f7b0..7cd48a0 100644
--- a/packages/SystemUI/res/values-mn-rMN/strings.xml
+++ b/packages/SystemUI/res/values-mn-rMN/strings.xml
@@ -23,7 +23,7 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Цэвэрлэх"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Жагсаалтаас устгах"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Апп мэдээлэл"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Сүүлийн апп хоосон"</string>
+ <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Таны саяхны дэлгэц энд харагдах болно"</string>
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Сүүлийн апп-уудыг хаах"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 сүүлийн апп"</item>
@@ -80,7 +80,7 @@
<string name="accessibility_back" msgid="567011538994429120">"Буцах"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Гэрийн"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Цэс"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Сүүлийн апп"</string>
+ <string name="accessibility_recent" msgid="1606470783629913980">"Саяхны дэлгэцүүд"</string>
<string name="accessibility_search_light" msgid="1103867596330271848">"Хайх"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камер"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Утас"</string>
@@ -155,7 +155,8 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Мэдэгдэл хаагдсан."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Мэдэгдлийн хураангуй самбар"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Шуурхай тохиргоо."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Сүүлийн апп"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Тохиргоо"</string>
+ <string name="accessibility_desc_recent_apps" msgid="8376953390514779637">"Саяхны дэлгэцүүд."</string>
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Хэрэглэгч <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобайл <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +168,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Самбарыг хаах"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Цаг нэмэх"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Цаг хасах"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G дата идэвхгүй"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G дата идэвхгүй"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Үүрэн дата идэвхгүй"</string>
@@ -238,7 +241,7 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ашигласан"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> хязгаар"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> анхааруулга"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Сүүлд ашигласан апп байхгүй"</string>
+ <string name="recents_empty_message" msgid="8682129509540827999">"Таны саяхны дэлгэц энд харагдах болно"</string>
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Аппликешны мэдээлэл"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Апп-дотор-түгжих"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"хайх"</string>
@@ -258,7 +261,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Та <xliff:g id="ALARM_TIME">%s</xliff:g>-д өөрийн сэрүүлгээ сонсохгүй"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Яаралтай биш мэдэгдлүүдийг доор"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Нээхийн тулд дахин товшино уу"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Түгжээг тайлах бол шудрана уу"</string>
<string name="phone_hint" msgid="3101468054914424646">"Утас гаргахын тулд баруун шударна уу"</string>
<string name="camera_hint" msgid="5241441720959174226">"Камер гаргахын тулд зүүн шударна уу"</string>
@@ -267,17 +271,24 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Нэн тэргүүний"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Бүгд"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Цэнэглэж байна (дүүргэхэд <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Хэрэглэгч нэмэх"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Шинэ хэрэглэгч"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Зочин"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Зочин"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Зочноос гарах"</string>
+ <string name="guest_new_guest" msgid="600537543078847803">"Зочин нэмэх"</string>
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Зочныг хасах"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Зочны нэвтрэлтээс гарч байна уу?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Зочны нэвтрэлтээс гарснаар локал датаг арилгах болно."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Тавтай морилно уу!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Та шинээр нэвтрэх гэж байна уу?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Тийм"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Үгүй, баярлалаа"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Нэг минутын турш"</item>
<item quantity="other" msgid="6924190729213550991">"%d минутын турш"</item>
@@ -307,4 +318,5 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Та VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") холбогдсон байна.\n\nТаны VPN үйлчилгээ үзүүлэгч нь таны төхөөрөмж болон имэйл, апп-ууд болон аюулгүй вэбсайтууд зэрэг таны сүлжээний үйл ажиллагааг хянах боломжтой."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Энэ төхөөрөмжийг \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n удирдаж байна \n Танай админ имэйл, апп-ууд, аюулгүй вэбсайтууд зэргийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой. Дэлгэрэнгүй мэдээллийг админаас авна уу.\n\nМөн та <xliff:g id="APPLICATION">%2$s</xliff:g>-д VPN холболт үүсгэх зөвшөөрөл өгсөн байна. Энэ апп мөн сүлжээний үйл ажиллагааг хянах боломжтой."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Энэ төхөөрөмжийг \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n удирдаж байна \nТанай админ имэйл, апп-ууд, аюулгүй вэбсайтууд зэргийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой. Дэлгэрэнгүй мэдээллийг админаас авна уу.\n\nМөн та VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\")-д холбогдсон байна. VPN үйлчилгээ үзүүлэгч таны сүлжээний үйл ажиллагааг мөн хянах боломжтой."</string>
+ <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Таныг гараар онгойлгох хүртэл төхөөрөмж түгжээтэй байх болно"</string>
</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml
index 18459f0..d7931f5 100644
--- a/packages/SystemUI/res/values-mr-rIN/strings.xml
+++ b/packages/SystemUI/res/values-mr-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"साफ करा"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"सूचीमधून काढा"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"अॅप माहिती"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"कोणतेही अलीकडील अॅप्स नाहीत"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"अलीकडील अॅप्स डिसमिस करा"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 अलीकडील अॅप"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"परत"</string>
<string name="accessibility_home" msgid="8217216074895377641">"मुख्यपृष्ठ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"मेनू"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"अलीकडील अॅप्स"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"शोधा"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"कॅमेरा"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"फोन"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"सूचना डिसमिस केल्या."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"सूचना शेड."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"द्रुत सेटिंग्ज."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"अलीकडील अॅप्स."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिंग्ज"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"वापरकर्ता <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"मोबाईल <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"पॅनेल बंद करा"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"अधिक वेळ"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"कमी वेळ"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G डेटा बंद आहे"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G डेटा बंद आहे"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"सेल्युलर डेटा बंद आहे"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> वापरले"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> मर्यादा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावणी"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"कोणतेही अलीकडील अॅप्स नाहीत"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग माहिती"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"अॅप-लॉक-करणे"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"शोधा"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"आपण आपला अलार्म <xliff:g id="ALARM_TIME">%s</xliff:g> वाजता ऐकणार नाही"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"खाली कमी तातडीच्या सूचना"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"उघडण्यासाठी पुन्हा टॅप करा"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"अनलॉक करण्यासाठी स्वाइप करा"</string>
<string name="phone_hint" msgid="3101468054914424646">"फोन साठी उजवीकडे स्वाइप करा"</string>
<string name="camera_hint" msgid="5241441720959174226">"कॅमेर्यासाठी डावीकडे स्वाइप करा"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"प्राधान्य"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"सर्व"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> पूर्ण होईपर्यंत) चार्ज होत आहे"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"वापरकर्ता जोडा"</string>
<string name="user_new_user_name" msgid="426540612051178753">"नवीन वापरकर्ता"</string>
<string name="guest_nickname" msgid="8059989128963789678">"अतिथी"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ अतिथी"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"निर्गमन करणारे अतिथी"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"अतिथी काढा"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"अतिथी सत्रातून निर्गमन करायचे?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"अतिथी सत्रातून निर्गमन केल्याने स्थानिक डेटा काढला जाईल."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"अतिथी, आपले पुन्हा स्वागत आहे!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"आपण एक नवीन सत्र प्रारंभ करु इच्छिता?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"होय"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"नाही, धन्यवाद"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"एक मिनिटासाठी"</item>
<item quantity="other" msgid="6924190729213550991">"%d मिनिटांसाठी"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"आपण VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") कनेक्ट केले आहे.\n\nआपला VPN सेवा प्रदाता ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या डिव्हाइस आणि नेटवर्क क्रियाकलापाचे परीक्षण करू शकतो."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"हे डिव्हाइस याद्वारे व्यवस्थापित केले जाते:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nआपला प्रशासक ईमेल, अॅप्स आणि सुरक्षित वेबसाइट, यासह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करण्यास सक्षम आहे. अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.\n\nतसेच, आपण VPN कनेक्शन सेट करण्यासाठी \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" ला परवानगी दिली आहे. हा अॅप नेटवर्क क्रियाकलापाचे देखील परीक्षण करू शकतो."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"हे डिव्हाइस याद्वारे व्यवस्थापित केले जाते:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nआपला प्रशासक ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करण्यास सक्षम आहे. अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.\n\nतसेच, आपण एका VPN शी कनेक्ट केले आहे (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). आपला VPN सेवा प्रदाता नेटवर्क क्रियाकलापाचे देखील परीक्षण करू शकतो."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml
index 6a6dcb5..f4b29f6 100644
--- a/packages/SystemUI/res/values-ms-rMY/strings.xml
+++ b/packages/SystemUI/res/values-ms-rMY/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Pdm bersih"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Alih keluar dari senarai"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Maklumat aplikasi"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Tiada aplikasi terbaharu"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Buang aplikasi terbaharu"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplikasi terbaharu"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Kembali"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Rumah"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplikasi terbaharu"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Cari"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Pemberitahuan diketepikan."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Bidai pemberitahuan."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Tetapan pantas."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Apl terbaru."</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Pengguna <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mudah Alih <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Tutup panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Lagi masa"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Kurang masa"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Data 2G-3G dimatikan"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Data 4G dimatikan"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Data selular dimatikan"</string>
@@ -238,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> digunakan"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> had"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Amaran <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Tiada apl terbaharu"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Maklumat Aplikasi"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"kunci ke apl"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cari"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Anda tdk akan mdgr penggera anda pd <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Pemberitahuan kurang penting di bawah"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ketik lagi untuk membuka"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Leret ke atas untuk membuka kunci"</string>
<string name="phone_hint" msgid="3101468054914424646">"Leret ke kanan untuk telefon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Leret ke kiri untuk kamera"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Keutamaan"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Semua"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Mengecas (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> sehingga penuh)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Tambah pengguna"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Pengguna baharu"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Tetamu"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Tetamu"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Tetamu keluar"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Keluar dari sesi tetamu?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Data tempatan akan dialih keluar apabila anda keluar dari sesi tetamu."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Selamat kembali, tetamu!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Adakah anda ingin memulakan sesi baharu?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ya"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Tidak, terima kasih"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Selama satu minit"</item>
<item quantity="other" msgid="6924190729213550991">"Selama %d minit"</item>
@@ -302,9 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"Pemantauan rangkaian"</string>
<string name="open_app" msgid="4011771120339160755">"Buka apl"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Putuskan sambungan VPN"</string>
- <string name="monitoring_description_device_owned" msgid="7512371572956715493">"Peranti ini diuruskan oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nPentadbir anda boleh mengawasi peranti aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nUntuk maklumat lanjut, hubungi pentadbir anda."</string>
- <string name="monitoring_description_vpn" msgid="7288268682714305659">"Anda memberikan \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" kebenaran untuk menyediakan sambungan VPN.\n\nApl ini boleh memantau peranti dan aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web yang selamat."</string>
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"Peranti ini diurus oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nPentadbir anda boleh mengawasi aktiviti peranti dan rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nUntuk maklumat lanjut, hubungi pentadbir anda."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Anda memberi \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" kebenaran untuk menyediakan sambungan VPN.\n\nApl ini boleh memantau aktiviti peranti dan rangkaian anda, termasuk e-mel, apl dan tapak web yang selamat."</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Anda disambungkan ke VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nPembekal perkhidmatan VPN anda boleh memantau aktiviti peranti dan rangkaian anda termasuk e-mel, apl dan tapak web selamat."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Peranti ini diuruskan oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nPentadbir anda berkemampuan memantau aktiviti rangkaian anda termasuk e-mel, apl dan tapak web yang selamat. Untuk maklumat lanjut, hubungi pentadbir anda.\n\nAnda juga memberikan \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" kebenaran untuk menyediakan rangkaian VPN. Apl ini juga boleh memantau aktiviti rangkaian."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Peranti ini diuruskan oleh:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nPentadbir anda berkemampuan memantau aktiviti rangkaian anda termasuk e-mel, apl dan tapak web yang selamat. Untuk maklumat lanjut, hubungi pentadbir anda.\n\nAnda juga disambungkan ke VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Pembekal perkhidmatan VPN anda juga boleh memantau aktiviti rangkaian."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml
index e78cded..f6a89e0 100644
--- a/packages/SystemUI/res/values-my-rMM/strings.xml
+++ b/packages/SystemUI/res/values-my-rMM/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"ရှင်းလင်းရန်"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"စာရင်းမှ ဖယ်မည်"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"အပ်ပလီကေးရှင်း အချက်အလက်များ"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"လတ်တလောအပ်ပလီကေးရှင်းများမရှိပါ"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"လတ်တလောအပ်ပလီကေးရှင်းများအား ဖယ်ထုတ်မည်"</string>
<!-- String.format failed for translation -->
<!-- no translation found for status_bar_accessibility_recent_apps:other (1040784359794890744) -->
@@ -32,29 +33,29 @@
<string name="status_bar_latest_events_title" msgid="6594767438577593172">"အကြောင်းကြားချက်များ။"</string>
<string name="battery_low_title" msgid="6456385927409742437">"ဘက်ထရီ အားနည်းနေ"</string>
<string name="battery_low_percent_format" msgid="1077244949318261761">"<xliff:g id="NUMBER">%d%%</xliff:g> ကျန်ရှိသည်"</string>
- <string name="battery_low_percent_format_saver_started" msgid="6534746636002666456">"<xliff:g id="NUMBER">%d%%</xliff:g> ကျန်နေ။ ဘက်ထရီ ချွေတာသူ ဖွင့်ထား။"</string>
+ <string name="battery_low_percent_format_saver_started" msgid="6534746636002666456">"<xliff:g id="NUMBER">%d%%</xliff:g> ကျန်နေ။ ဘက်ထရီ ချွေတာသူ ဖွင့်ထား။"</string>
<string name="invalid_charger" msgid="4549105996740522523">"လက်ရှိUSBအားသွင်းခြင်း အသုံးမပြုနိုင်ပါ \n ပေးထားသောအားသွင်းကိရိယာကိုသာ အသုံးပြုပါ"</string>
<string name="invalid_charger_title" msgid="3515740382572798460">"USB အားသွင်းမှု မပံ့ပိုးပါ။"</string>
- <string name="invalid_charger_text" msgid="5474997287953892710">"ပေးခဲ့သည့် အားသွင်းစက်ကိုသာ အသုံးပြုပါ"</string>
+ <string name="invalid_charger_text" msgid="5474997287953892710">"ပေးခဲ့သည့် အားသွင်းစက်ကိုသာ အသုံးပြုပါ"</string>
<string name="battery_low_why" msgid="4553600287639198111">"ဆက်တင်များ"</string>
- <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"ဘက်ထရီ ချွေတာမှုကို ဖွင့်ရမလား?"</string>
- <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"ဖွင့်ရန်"</string>
- <string name="battery_saver_start_action" msgid="5576697451677486320">"ဘက်ထရီ ချွေတာမှုကို ဖွင့်ရန်"</string>
+ <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"ဘက်ထရီ ချွေတာမှုကို ဖွင့်ရမလား?"</string>
+ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"ဖွင့်ရန်"</string>
+ <string name="battery_saver_start_action" msgid="5576697451677486320">"ဘက်ထရီ ချွေတာမှုကို ဖွင့်ရန်"</string>
<string name="status_bar_settings_settings_button" msgid="3023889916699270224">"အပြင်အဆင်များ"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"ဝိုင်ဖိုင်"</string>
<string name="status_bar_settings_airplane" msgid="4879879698500955300">"လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်"</string>
- <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"မျက်နှာပြင်အလိုအလျောက်လှည့်ရန်"</string>
+ <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"မျက်နှာပြင်အလိုအလျောက်လှည့်ရန်"</string>
<string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string>
<string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string>
<string name="status_bar_settings_notifications" msgid="397146176280905137">"သတိပေးချက်များ"</string>
- <string name="bluetooth_tethered" msgid="7094101612161133267">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
- <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ထည့်သွင်းနည်းများ သတ်မှတ်ခြင်း"</string>
+ <string name="bluetooth_tethered" msgid="7094101612161133267">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ထည့်သွင်းနည်းများ သတ်မှတ်ခြင်း"</string>
<string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ခလုတ်ပါဝင်သော ကီးဘုတ်"</string>
- <string name="usb_device_permission_prompt" msgid="834698001271562057">"<xliff:g id="APPLICATION">%1$s</xliff:g>အပ်ပလီကေးရှင်းအား USBပစ္စည်းကို ချိတ်ဆက်ရန်ခွင့်ပြုမည်လား"</string>
- <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"<xliff:g id="APPLICATION">%1$s</xliff:g> အပ်ပလီကေးရှင်းကို USB တွဲဖက်ပစ္စည်းများအား ဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုသည်"</string>
- <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"<xliff:g id="ACTIVITY">%1$s</xliff:g> အားUSBပစ္စည်း ချိတ်ဆက်နေစဥ် ဖွင့်မည်လား"</string>
- <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"<xliff:g id="ACTIVITY">%1$s</xliff:g> အား USBတွဲဖက်ပစ္စည်း ချိတ်ဆက်ထားစဥ် ဖွင့်မည်"</string>
- <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"ဒီUSBပစ္စည်းနှင့်ဘယ်အပ်ပလီကေးရှင်းမှ အလုပ်မလုပ်ပါ။ ပိုမိုသိရန် <xliff:g id="URL">%1$s</xliff:g>တွင် လေ့လာပါ"</string>
+ <string name="usb_device_permission_prompt" msgid="834698001271562057">"<xliff:g id="APPLICATION">%1$s</xliff:g>အပ်ပလီကေးရှင်းအား USBပစ္စည်းကို ချိတ်ဆက်ရန်ခွင့်ပြုမည်လား"</string>
+ <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"<xliff:g id="APPLICATION">%1$s</xliff:g> အပ်ပလီကေးရှင်းကို USB တွဲဖက်ပစ္စည်းများအား ဝင်ရောက်ကြည့်ရှုရန်ခွင့်ပြုသည်"</string>
+ <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"<xliff:g id="ACTIVITY">%1$s</xliff:g> အားUSBပစ္စည်း ချိတ်ဆက်နေစဥ် ဖွင့်မည်လား"</string>
+ <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"<xliff:g id="ACTIVITY">%1$s</xliff:g> အား USBတွဲဖက်ပစ္စည်း ချိတ်ဆက်ထားစဥ် ဖွင့်မည်"</string>
+ <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"ဒီUSBပစ္စည်းနှင့်ဘယ်အပ်ပလီကေးရှင်းမှ အလုပ်မလုပ်ပါ။ ပိုမိုသိရန် <xliff:g id="URL">%1$s</xliff:g>တွင် လေ့လာပါ"</string>
<string name="title_usb_accessory" msgid="4966265263465181372">"USBတွဲဖက်ပစ္စည်းများ"</string>
<string name="label_view" msgid="6304565553218192990">"မြင်ကွင်း"</string>
<string name="always_use_device" msgid="1450287437017315906">"ဤUSBပစ္စည်းများအတွက် မူရင်းအတိုင်း အသုံးပြုပါ။"</string>
@@ -62,27 +63,28 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB အမှားရှာဖွေပြင်ဆင်ခြင်း ခွင့်ပြုပါမည်လား?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ဒီကွန်ပျူတာရဲ့ RSA key fingerprint ကတော့:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g> ဖြစ်ပါသည်"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ဒီကွန်ပျူတာမှ အမြဲခွင့်ပြုရန်"</string>
- <string name="compat_mode_on" msgid="6623839244840638213">"ဖန်သားပြင်ပြည့် ချဲ့ခြင်း"</string>
- <string name="compat_mode_off" msgid="4434467572461327898">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string>
+ <string name="compat_mode_on" msgid="6623839244840638213">"ဖန်သားပြင်ပြည့် ချဲ့ခြင်း"</string>
+ <string name="compat_mode_off" msgid="4434467572461327898">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string>
<string name="screenshot_saving_ticker" msgid="7403652894056693515">"ဖန်သားပြင်ဓါတ်ပုံသိမ်းစဉ်.."</string>
<string name="screenshot_saving_title" msgid="8242282144535555697">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား သိမ်းဆည်းပါမည်"</string>
<string name="screenshot_saving_text" msgid="2419718443411738818">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား သိမ်းဆည်းပြီးပါပြီ"</string>
<string name="screenshot_saved_title" msgid="6461865960961414961">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား ဖမ်းယူပြီး"</string>
- <string name="screenshot_saved_text" msgid="1152839647677558815">"သင့်ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား ကြည့်ရှုရန် ထိပါ"</string>
+ <string name="screenshot_saved_text" msgid="1152839647677558815">"သင့်ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား ကြည့်ရှုရန် ထိပါ"</string>
<string name="screenshot_failed_title" msgid="705781116746922771">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား မဖမ်းစီးနိုင်ပါ"</string>
- <string name="screenshot_failed_text" msgid="1260203058661337274">"မျက်နှာပြင်လျှပ်တပြက်ပုံကို မရုက်နိုင်ခဲ့ပါ၊ သိုလှောင်မှု နေရာ အကန့်အသတ် ရှိနေ၍ သို့မဟုတ် app သို့မဟုတ် သင်၏ အဖွဲ့အစည်းက ခွင့်မပြု၍ ဖြစ်နိုင်သည်။"</string>
+ <string name="screenshot_failed_text" msgid="1260203058661337274">"မျက်နှာပြင်လျှပ်တပြက်ပုံကို မရုက်နိုင်ခဲ့ပါ၊ သိုလှောင်မှု နေရာ အကန့်အသတ် ရှိနေ၍ သို့မဟုတ် app သို့မဟုတ် သင်၏ အဖွဲ့အစည်းက ခွင့်မပြု၍ ဖြစ်နိုင်သည်။"</string>
<string name="usb_preference_title" msgid="6551050377388882787">"USB ဖိုင်ပြောင်း ရွေးမှုများ"</string>
- <string name="use_mtp_button_title" msgid="4333504413563023626">"မီဒီယာပလေရာအနေဖြင့် တပ်ဆင်ရန် (MTP)"</string>
- <string name="use_ptp_button_title" msgid="7517127540301625751">"ကင်မရာအနေဖြင့် တပ်ဆင်ရန် (PTP)"</string>
+ <string name="use_mtp_button_title" msgid="4333504413563023626">"မီဒီယာပလေရာအနေဖြင့် တပ်ဆင်ရန် (MTP)"</string>
+ <string name="use_ptp_button_title" msgid="7517127540301625751">"ကင်မရာအနေဖြင့် တပ်ဆင်ရန် (PTP)"</string>
<string name="installer_cd_button_title" msgid="2312667578562201583">"Macအတွက်Andriodဖိုင်ပြောင်းအပ်ပလီကေးရှင်းထည့်ခြင်း"</string>
<string name="accessibility_back" msgid="567011538994429120">"နောက်သို့"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ပင်မစာမျက်နှာ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"မီနူး"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"လတ်တလော သုံးခဲ့ အပ်ပလီကေးရှင်း"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ရှာဖွေရန်"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"ကင်မရာ"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ဖုန်း"</string>
- <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ထည့်သွင်းခြင်းခလုတ်အား ပြောင်းခြင်း"</string>
+ <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ထည့်သွင်းခြင်းခလုတ်အား ပြောင်းခြင်း"</string>
<string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"အံ့ဝင်သောချုံ့ချဲ့ခလုတ်"</string>
<string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"ဖန်သားပြင်ပေါ်တွင် အသေးမှအကြီးသို့ချဲ့ခြင်း"</string>
<string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"ဘလူးတုသ်ချိတ်ဆက်ထားမှု"</string>
@@ -91,17 +93,17 @@
<string name="accessibility_battery_one_bar" msgid="7774887721891057523">"ဘတ္တရီတစ်ဘား။"</string>
<string name="accessibility_battery_two_bars" msgid="8500650438735009973">"ဘတ္တရီနှစ်ဘား။"</string>
<string name="accessibility_battery_three_bars" msgid="2302983330865040446">"ဘတ္တရီသုံးဘား။"</string>
- <string name="accessibility_battery_full" msgid="8909122401720158582">"ဘတ္တရီအပြည့်။"</string>
+ <string name="accessibility_battery_full" msgid="8909122401720158582">"ဘတ္တရီအပြည့်။"</string>
<string name="accessibility_no_phone" msgid="4894708937052611281">"ဖုန်းလိုင်းမရှိပါ။"</string>
<string name="accessibility_phone_one_bar" msgid="687699278132664115">"ဖုန်းလိုင်းတစ်ဘား။"</string>
<string name="accessibility_phone_two_bars" msgid="8384905382804815201">"ဖုန်းလိုင်းနှစ်ဘား။"</string>
<string name="accessibility_phone_three_bars" msgid="8521904843919971885">"ဖုန်းလိုင်းသုံးဘား။"</string>
- <string name="accessibility_phone_signal_full" msgid="6471834868580757898">"ဖုန်းလိုင်းအပြည့်။"</string>
+ <string name="accessibility_phone_signal_full" msgid="6471834868580757898">"ဖုန်းလိုင်းအပြည့်။"</string>
<string name="accessibility_no_data" msgid="4791966295096867555">"ဒေတာမရှိပါ။"</string>
<string name="accessibility_data_one_bar" msgid="1415625833238273628">"ဒေတာတစ်ဘား။"</string>
- <string name="accessibility_data_two_bars" msgid="6166018492360432091">"ဒေတာထုတ်လွှင့်မှု ၂ဘားဖမ်းမိခြင်း။"</string>
+ <string name="accessibility_data_two_bars" msgid="6166018492360432091">"ဒေတာထုတ်လွှင့်မှု ၂ဘားဖမ်းမိခြင်း။"</string>
<string name="accessibility_data_three_bars" msgid="9167670452395038520">"ဒေတာသုံးဘား။"</string>
- <string name="accessibility_data_signal_full" msgid="2708384608124519369">"ဒေတာထုတ်လွှင့်မှုအပြည့်ဖမ်းမိခြင်း"</string>
+ <string name="accessibility_data_signal_full" msgid="2708384608124519369">"ဒေတာထုတ်လွှင့်မှုအပြည့်ဖမ်းမိခြင်း"</string>
<string name="accessibility_wifi_off" msgid="3177380296697933627">"ဝိုင်ဖိုင် မရှိ"</string>
<string name="accessibility_no_wifi" msgid="1425476551827924474">"ဝိုင်ဖိုင် ချိတ်ဆက်ထားမှု မရှိပါ"</string>
<string name="accessibility_wifi_one_bar" msgid="7735893178010724377">"ဝိုင်ဖိုင် ၁ ဘားရှိ"</string>
@@ -119,7 +121,7 @@
<string name="accessibility_one_bar" msgid="1685730113192081895">"တစ်တုံး"</string>
<string name="accessibility_two_bars" msgid="6437363648385206679">"၂ ဘား"</string>
<string name="accessibility_three_bars" msgid="2648241415119396648">"၃ ဘား"</string>
- <string name="accessibility_signal_full" msgid="9122922886519676839">"ဒေတာထုတ်လွှင့်မှုအပြည့်ဖမ်းမိခြင်း"</string>
+ <string name="accessibility_signal_full" msgid="9122922886519676839">"ဒေတာထုတ်လွှင့်မှုအပြည့်ဖမ်းမိခြင်း"</string>
<string name="accessibility_desc_on" msgid="2385254693624345265">"ဖွင့်ထားသည်"</string>
<string name="accessibility_desc_off" msgid="6475508157786853157">"ပိတ်ထားသည်"</string>
<string name="accessibility_desc_connected" msgid="8366256693719499665">"ဆက်သွယ်ထားပြီး"</string>
@@ -136,7 +138,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_bluetooth_tether" msgid="4102784498140271969">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+ <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်။"</string>
<string name="accessibility_battery_level" msgid="7451474187113371965">"ဘတ္တရီ <xliff:g id="NUMBER">%d</xliff:g> ရာခိုင်နှုန်း။"</string>
<string name="accessibility_settings_button" msgid="799583911231893380">"စနစ်အပြင်အဆင်များ"</string>
@@ -153,7 +155,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"အကြောင်းကြားချက်ကိုဖယ်ရှားပြီး"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"အကြောင်းကြားစာအကွက်"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"အမြန်လုပ် အပြင်အဆင်"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"လတ်တလော သုံးခဲ့ အပလီကေးရှင်း"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ဆက်တင်များ"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"သုံးစွဲသူ <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"မိုဘိုင်းလ် <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -165,12 +169,14 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ပိတ်ရန် အကွက်"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"အချိန် တိုးရန်"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"အချိန် လျှော့ရန်"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G ဒေတာ ပိတ်ထား"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G ဒေတာ ပိတ်ထား"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ဆယ်လူလာ ဒေတာကို ပိတ်ထား"</string>
<string name="data_usage_disabled_dialog_title" msgid="8723412000355709802">"ဒေတာ ပိတ်ထား"</string>
- <string name="data_usage_disabled_dialog" msgid="6468718338038876604">"သင်၏ ကိရိယာသည် သင်က သတ်မှတ်ခဲ့သည့် ကန့်သတ်ချက်ကို ပြည့်မီသွား၍ ပိတ်သွားသည်။ \n\n၎င်းကို ပြန်ပြီး ဖွင့်မှုအတွက် သင်၏ စီမံပေးသူ ထံမှ ငွေတောင်းခံ လာနိုင်ပါသည်။"</string>
- <string name="data_usage_disabled_dialog_enable" msgid="5538068036107372895">"ဒေတာ ဖွင့်ပေးရန်"</string>
+ <string name="data_usage_disabled_dialog" msgid="6468718338038876604">"သင်၏ ကိရိယာသည် သင်က သတ်မှတ်ခဲ့သည့် ကန့်သတ်ချက်ကို ပြည့်မီသွား၍ ပိတ်သွားသည်။ \n\n၎င်းကို ပြန်ပြီး ဖွင့်မှုအတွက် သင်၏ စီမံပေးသူ ထံမှ ငွေတောင်းခံ လာနိုင်ပါသည်။"</string>
+ <string name="data_usage_disabled_dialog_enable" msgid="5538068036107372895">"ဒေတာ ဖွင့်ပေးရန်"</string>
<string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"အင်တာနက်မရှိ"</string>
<string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"ကြိုးမဲ့ဆက်သွယ်မှု"</string>
<string name="gps_notification_searching_text" msgid="8574247005642736060">"GPSအားရှာဖွေသည်"</string>
@@ -190,13 +196,13 @@
<string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"ဘလူးတု"</string>
<string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ဘလူးတု (<xliff:g id="NUMBER">%d</xliff:g> စက်များ)"</string>
<string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"ဘလူးတု ပိတ်ထားရန်"</string>
- <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"ချိတ်တွဲထားသည့် ကိရိယာများ မရှိ"</string>
+ <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"ချိတ်တွဲထားသည့် ကိရိယာများ မရှိ"</string>
<string name="quick_settings_brightness_label" msgid="6968372297018755815">"အလင်းတောက်ပမှု"</string>
<string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"အော်တို-လည်"</string>
<string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"လည်မှု သော့ပိတ်ထား"</string>
<string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"ဒေါင်လိုက်"</string>
<string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"ဘေးတိုက်"</string>
- <string name="quick_settings_ime_label" msgid="7073463064369468429">"ထည့်သွင်းရန်နည်းလမ်း"</string>
+ <string name="quick_settings_ime_label" msgid="7073463064369468429">"ထည့်သွင်းရန်နည်းလမ်း"</string>
<string name="quick_settings_location_label" msgid="5011327048748762257">"တည်နေရာ"</string>
<string name="quick_settings_location_off_label" msgid="7464544086507331459">"တည်နေရာပြမှု မရှိ"</string>
<string name="quick_settings_media_device_label" msgid="1302906836372603762">"မီဒီယာ စက်ပစ္စည်း"</string>
@@ -215,7 +221,7 @@
<string name="quick_settings_cast_title" msgid="1893629685050355115">"ကာစ်တ် မျက်နှာပြင်"</string>
<string name="quick_settings_casting" msgid="6601710681033353316">"ကာစ်တင်"</string>
<string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"အမည်မတပ် ကိရိယာ"</string>
- <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"ကာစ်တ် လုပ်ရန် အသင့် ရှိနေပြီ"</string>
+ <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"ကာစ်တ် လုပ်ရန် အသင့် ရှိနေပြီ"</string>
<string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"ကိရိယာများ မရှိ"</string>
<string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"အလင်းတောက်ပမှု"</string>
<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"အလိုအလျောက်"</string>
@@ -232,68 +238,78 @@
<string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"ဆယ်လူလာ ဒေတာ"</string>
<string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ဒေတာ သုံးစွဲမှု"</string>
<string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ကျန်ရှိ ဒေတာ"</string>
- <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"ကန့်သတ်ချက် ကျော်လွန်"</string>
+ <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"ကန့်သတ်ချက် ကျော်လွန်"</string>
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> သုံးထား"</string>
- <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ကန့်သတ်ချက်"</string>
+ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ကန့်သတ်ချက်"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> သတိပေးချက်"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"မကြာမီတုန်းက appများ မရှိ"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"အပလီကေးရှင်း အင်ဖို"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"appသို့ သော့ခတ်ထားရန်"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string>
<string name="expanded_header_battery_charged" msgid="5945855970267657951">"အားသွင်းပြီး"</string>
<string name="expanded_header_battery_charging" msgid="205623198487189724">"အားသွင်းနေ"</string>
- <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ပြည်သည့် အထိ"</string>
+ <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ပြည်သည့် အထိ"</string>
<string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"အား မသွင်းပါ"</string>
<string name="ssl_ca_cert_warning" msgid="9005954106902053641">"ကွန်ယက်ကို\n စောင့်ကြည့်စစ်ဆေးခံရနိုင်သည်"</string>
<string name="description_target_search" msgid="3091587249776033139">"ရှာဖွေရန်"</string>
<string name="description_direction_up" msgid="7169032478259485180">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် အပေါ်ကို ပွတ်ဆွဲပါ"</string>
<string name="description_direction_left" msgid="7207478719805562165">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် ဖယ်ဘက်ကို ပွတ်ဆွဲပါ"</string>
<string name="zen_no_interruptions_with_warning" msgid="2522931836819051293">"နှိုးစက်များ အပါအဝင် ကြားဖြတ်ဝင်မှုများ မလို"</string>
- <string name="zen_no_interruptions" msgid="7970973750143632592">"ကြားဖြတ်ဝင်မှု ခွင့်မပြုရန်"</string>
+ <string name="zen_no_interruptions" msgid="7970973750143632592">"ကြားဖြတ်ဝင်မှု ခွင့်မပြုရန်"</string>
<string name="zen_important_interruptions" msgid="3477041776609757628">"ဦးစားပေး ကြားဖြတ်ဝင်မှုများ သာလျှင်"</string>
<string name="zen_alarm_information_time" msgid="5235772206174372272">"သင်၏ နောက် နှိုးစက်၏ အချိန်မှာ<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="zen_alarm_information_day_time" msgid="8422733576255047893">"သင်၏ နောက် နှိုးစက်မှာ <xliff:g id="ALARM_DAY_AND_TIME">%s</xliff:g>"</string>
<string name="zen_alarm_warning" msgid="6873910860111498041">"သင်သည် သင်၏ <xliff:g id="ALARM_TIME">%s</xliff:g> နှိုးစက်ကို ကြားရမည် မဟုတ်"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
- <string name="speed_bump_explanation" msgid="1288875699658819755">"အရေးပါမှု နည်းသည့် အကြောင်းကြားချက်များ အောက်မှာ"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"ဖွင့်ရန် ထပ်ပြီး ပုတ်ပါ"</string>
- <string name="keyguard_unlock" msgid="8043466894212841998">"သော့ဖွင့်ရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string>
+ <string name="speed_bump_explanation" msgid="1288875699658819755">"အရေးပါမှု နည်းသည့် အကြောင်းကြားချက်များ အောက်မှာ"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
+ <string name="keyguard_unlock" msgid="8043466894212841998">"သော့ဖွင့်ရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string>
<string name="phone_hint" msgid="3101468054914424646">"ဖုန်း အတွက် ညာသို့ ပွတ်ဆွဲပါ"</string>
<string name="camera_hint" msgid="5241441720959174226">"ကင်မရာ အတွက် ဘယ်သို့ ပွတ်ဆွဲပါ"</string>
- <string name="zen_mode_forever" msgid="4316804956488785559">"အကန့်အသတ်မရှိစွာ"</string>
+ <string name="zen_mode_forever" msgid="4316804956488785559">"အကန့်အသတ်မရှိစွာ"</string>
<string name="interruption_level_none" msgid="3831278883136066646">"မရှိ"</string>
<string name="interruption_level_priority" msgid="6517366750688942030">"ဦးစားပေးမှု"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"အားလုံး"</string>
- <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> အပြည့် အထိ) အားသွင်းနေ"</string>
+ <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> အပြည့် အထိ) အားသွင်းနေ"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"သုံးသူ ထပ်ထည့်ရန်"</string>
<string name="user_new_user_name" msgid="426540612051178753">"အသုံးပြုသူ အသစ်"</string>
- <string name="guest_nickname" msgid="8059989128963789678">"ဧည့်သည်"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ဧည့်သည်"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ဧည့်သည့် ထွက်ရန်"</string>
- <string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ဧည့်သည် ချိတ်ဆက်မှုထဲက ထွက်မလား?"</string>
- <string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ဧည့်သည် ချိတ်ဆက်မှု ထဲမှ ထွက်လိုက်ခြင်းက စက်တွင်း ဒေတာကို ဖယ်ရှားပစ်မည်။"</string>
- <string name="guest_wipe_session_title" msgid="6419439912885956132">"ပြန်လာတာ ကြိုဆိုပါသည်၊ ဧည့်သည်!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"သင်သည် ချိတ်ဆက်မှု အသစ် တစ်ခုကို စတင်ချင်သလား?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ဟုတ်"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"မလို၊ ကျေးဇူးပဲ"</string>
+ <string name="guest_nickname" msgid="8059989128963789678">"ဧည့်သည်"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"ဧည့်သည်ကို ဖယ်ထုတ်ရန်"</string>
+ <string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ဧည့်သည် ချိတ်ဆက်မှုထဲက ထွက်မလား?"</string>
+ <string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"ဧည့်သည် ချိတ်ဆက်မှု ထဲမှ ထွက်လိုက်ခြင်းက စက်တွင်း ဒေတာကို ဖယ်ရှားပစ်မည်။"</string>
+ <string name="guest_wipe_session_title" msgid="6419439912885956132">"ပြန်လာတာ ကြိုဆိုပါသည်၊ ဧည့်သည်!"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"တစ်မိနစ် အတွင်း"</item>
<item quantity="other" msgid="6924190729213550991">"%d မိနစ် အတွင်း"</item>
</plurals>
<!-- String.format failed for translation -->
<!-- no translation found for zen_mode_duration_hours:other (5408537517529822157) -->
- <string name="battery_saver_notification_title" msgid="237918726750955859">"ဘက်ထရီ ချွေတာသူ ဖွင့်ထား"</string>
- <string name="battery_saver_notification_text" msgid="820318788126672692">"လုပ်ကိုင်မှုကို လျှော့ချလျက် နောက်ခံ ဒေတာကို ကန့်သတ်သည်"</string>
+ <string name="battery_saver_notification_title" msgid="237918726750955859">"ဘက်ထရီ ချွေတာသူ ဖွင့်ထား"</string>
+ <string name="battery_saver_notification_text" msgid="820318788126672692">"လုပ်ကိုင်မှုကို လျှော့ချလျက် နောက်ခံ ဒေတာကို ကန့်သတ်သည်"</string>
<string name="battery_saver_notification_action_text" msgid="109158658238110382">"ဘက်ထရီ ချွေတာမှုကို ပိတ်ထားရန်"</string>
<string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g>%%"</string>
<string name="notification_hidden_text" msgid="1135169301897151909">"အကြောင်းအရာများ ဝှက်ထား"</string>
- <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> က သင်၏ မျက်နှာပြင် ပေါ်မှာ ပြသထားသည့် အရာတိုင်းကို စတင် ဖမ်းယူမည်။"</string>
+ <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> က သင်၏ မျက်နှာပြင် ပေါ်မှာ ပြသထားသည့် အရာတိုင်းကို စတင် ဖမ်းယူမည်။"</string>
<string name="media_projection_remember_text" msgid="3103510882172746752">"နောက်ထပ် မပြပါနှင့်"</string>
<string name="clear_all_notifications_text" msgid="814192889771462828">"အားလုံး ရှင်းလင်းရန်"</string>
<string name="media_projection_action_text" msgid="8470872969457985954">"ယခု စတင်ပါ"</string>
<string name="empty_shade_text" msgid="708135716272867002">"အကြောင်းကြားချက်များ မရှိ"</string>
- <string name="device_owned_footer" msgid="3802752663326030053">"ကိရိယာကို စောင့်ကြပ် နိုင်ပါသည်"</string>
- <string name="vpn_footer" msgid="2388611096129106812">"ကွန်ရက်ကို ကို စောင့်ကြပ် နိုင်ပါသည်"</string>
+ <string name="device_owned_footer" msgid="3802752663326030053">"ကိရိယာကို စောင့်ကြပ် နိုင်ပါသည်"</string>
+ <string name="vpn_footer" msgid="2388611096129106812">"ကွန်ရက်ကို ကို စောင့်ကြပ် နိုင်ပါသည်"</string>
<string name="monitoring_title_device_owned" msgid="7121079311903859610">"ကိရိယာကို စောင့်ကြပ်ခြင်း"</string>
<string name="monitoring_title" msgid="169206259253048106">"ကွန်ရက်ကို စောင့်ကြပ်ခြင်း"</string>
<string name="open_app" msgid="4011771120339160755">"appကို ဖွင့်ရန်"</string>
@@ -301,6 +317,8 @@
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"ဤစက်ပစ္စည်းကို စီမံခန့်ခွဲသူ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nသင့်အက်ဒ်မင်သည် သင့်စက်ပစ္စည်းနှင့် အီးမေးများ၊ app များ နှင့် လုံခြုံသည့်ဝက်ဘ်ဆိုက် အပါအဝင် ကွန်ယက် လှုပ်ှရားမှုများကို စောင့်ကြည့်နိုင်သည်။\n\nနောက်ထပ်အချက်အလက်များအတွက်၊ သင့်အက်ဒ်မင်ကို ဆက်သွယ်ပါ။"</string>
<string name="monitoring_description_vpn" msgid="7288268682714305659">"သင် \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" ကို VPN စတင်သုံးခွင့်ပေးလိုက်သည်။ \n\n ဤ app သည် သင့်စက်ပစ္စည်းနှင့် အီးမေးများ၊ app များ နှင့် လုံခြုံသည့်ဝက်ဘ်ဆိုက် အပါအဝင် ကွန်ယက် လှုပ်ှရားမှုများကို စောင့်ကြည့်နိုင်သည်။"</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") ကို သင်ချိတ်ဆက်မိ၏။\n\nသင့် VPN ဝန်ဆောင်မှုပေးသူသည် သင့်စက်ပစ္စည်းနှင့် အီးမေးများ၊ app များ နှင့် လုံခြုံသည့်ဝက်ဘ်ဆိုက် အပါအဝင် ကွန်ယက် လှုပ်ှရားမှုများကို စောင့်ကြည့်နိုင်သည်။"</string>
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ဒီကိရိယာကို စီမံကွပ်ကဲသူမှာ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nသင်၏ စီမံအုပ်ချုပ်သူက သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို၊ အီးမေးလ်များ၊ appများ နှင့် လုံခြုံသည့် ဝက်ဘ်ဆိုက်များ အပါအဝင်ကို၊ စောင့်ကြပ် နိုင်ပါသည်။ အချက်အလက်များ ပိုပြီး ရယူရန်၊ သင်၏ စီမံအုပ်ချုပ်သူကို ဆက်သွယ်ပါ။\n\n ထို့အပြင် သင်သည် \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" အား VPN ချိတ်ဆက်မှု စဖွင့်လုပ်ကိုင်ရန် ခွင့်ပြုခဲ့သည်။ ဒီ appကပါ သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို စောင့်ကြပ် နိုင်ပါသည်။"</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ဒီကိရိယာကို စီမံကွပ်ကဲသူမှာ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nသင်၏ စီမံအုပ်ချုပ်သူက သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို၊ အီးမေးလ်များ၊ appများ နှင့် လုံခြုံသည့် ဝက်ဘ်ဆိုက်များ အပါအဝင်ကို၊ စောင့်ကြပ် နိုင်ပါသည်။ အချက်အလက်များ ပိုပြီး ရယူရန်၊ သင်၏ စီမံအုပ်ချုပ်သူကို ဆက်သွယ်ပါ။\n\nထို့အပြင်၊ သင်သည် VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") သို့ ချိတ်ဆက်ထားသည်။ သင်၏ VPN ဝန်ဆောင်မှုကို စီမံပေးသူကပါ ကွန်ရက် လှုပ်ရှားမှုများကို စောင့်ကြပ်နိုင်သေးသည်။"</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ဒီကိရိယာကို စီမံကွပ်ကဲသူမှာ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nသင်၏ စီမံအုပ်ချုပ်သူက သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို၊ အီးမေးလ်များ၊ appများ နှင့် လုံခြုံသည့် ဝက်ဘ်ဆိုက်များ အပါအဝင်ကို၊ စောင့်ကြပ် နိုင်ပါသည်။ အချက်အလက်များ ပိုပြီး ရယူရန်၊ သင်၏ စီမံအုပ်ချုပ်သူကို ဆက်သွယ်ပါ။\n\n ထို့အပြင် သင်သည် \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" အား VPN ချိတ်ဆက်မှု စဖွင့်လုပ်ကိုင်ရန် ခွင့်ပြုခဲ့သည်။ ဒီ appကပါ သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို စောင့်ကြပ် နိုင်ပါသည်။"</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ဒီကိရိယာကို စီမံကွပ်ကဲသူမှာ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nသင်၏ စီမံအုပ်ချုပ်သူက သင်၏ ကွန်ရက် လှုပ်ရှားမှုကို၊ အီးမေးလ်များ၊ appများ နှင့် လုံခြုံသည့် ဝက်ဘ်ဆိုက်များ အပါအဝင်ကို၊ စောင့်ကြပ် နိုင်ပါသည်။ အချက်အလက်များ ပိုပြီး ရယူရန်၊ သင်၏ စီမံအုပ်ချုပ်သူကို ဆက်သွယ်ပါ။\n\nထို့အပြင်၊ သင်သည် VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") သို့ ချိတ်ဆက်ထားသည်။ သင်၏ VPN ဝန်ဆောင်မှုကို စီမံပေးသူကပါ ကွန်ရက် လှုပ်ရှားမှုများကို စောင့်ကြပ်နိုင်သေးသည်။"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index df54200..896cb50 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Fjern"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Fjern fra listen"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Info om appen"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ingen nylige apper"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Avvis nylige apper"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Én nylig app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Tilbake"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Startside"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Meny"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nylige apper"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Søk"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefonnummer"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Varselet ble skjult."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Varselskygge."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Hurtiginnstillinger."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Nylige apper."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Innstillinger"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Bruker: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil – <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Lukk panelet"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mer tid"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mindre tid"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G- og 3G-data er slått av"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-datatrafikk er slått av"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobildatatrafikk er slått av"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> brukt"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grense på <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel for <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ingen nylige apper"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformasjon"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lås til app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Søk"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Du kommer ikke til å høre alarmen kl. <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Mindre presserende varsler nedenfor"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Trykk på nytt for å åpne"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Sveip oppover for å låse opp"</string>
<string name="phone_hint" msgid="3101468054914424646">"Sveip mot høyre for å åpne telefonen"</string>
<string name="camera_hint" msgid="5241441720959174226">"Sveip mot venstre for å åpne kameraet"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alle"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Lader (fulladet om <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Legg til brukere"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Ny bruker"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gjest"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gjest"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Avslutt gjesteøkten"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Fjern gjesten"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Vil du avslutte gjesteøkten?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Hvis du avslutter gjesteøkten, fjernes lokale data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Velkommen tilbake, gjest!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vil du starte en ny økt?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nei takk"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"I ett minutt"</item>
<item quantity="other" msgid="6924190729213550991">"I %d minutter"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Enheten er koblet til et VPN-nettverk («<xliff:g id="APPLICATION">%1$s</xliff:g>»).\n\nVPN-tjenesteleverandøren din kan overvåke nettverksaktiviteten din, inkludert e-post, apper og sikre nettsteder."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Denne enheten administreres av:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratoren din kan overvåke nettverksaktiviteten din, inkludert e-poster, apper og sikre nettsteder. Ta kontakt med administratoren din for mer om dette.\n\nI tillegg ga du «<xliff:g id="APPLICATION">%2$s</xliff:g>» tillatelse til å konfigurere en VPN-tilkobling. Denne appen kan også overvåke nettverksaktiviteten din."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Denne enheten administreres av:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratoren din kan overvåke nettverksaktiviteten din, inkludert e-poster, apper og sikre nettsteder. Ta kontakt med administratoren din for mer om dette.\n\nI tillegg er enheten koblet til et VPN-nettverk («<xliff:g id="APPLICATION">%2$s</xliff:g>»). VPN-tjenesteleverandøren kan også overvåke nettverksaktiviteten din."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml
index 574a177..5f2c7ba 100644
--- a/packages/SystemUI/res/values-ne-rNP/strings.xml
+++ b/packages/SystemUI/res/values-ne-rNP/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"हटाउनुहोस्"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"सूचीबाट हटाउनुहोस्"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"अनुप्रयोगको जानकारी"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"कुनै नयाँ अनुप्रयोगहरू छैनन्"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"नयाँ अनुप्रयोगहरू खारेज गर्नुहोस्"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"१ भरखरै अनुप्रयोग"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"पछाडि"</string>
<string name="accessibility_home" msgid="8217216074895377641">"गृह"</string>
<string name="accessibility_menu" msgid="316839303324695949">"मेनु"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"भर्खरका अनुप्रयोगहरू"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"खोज्नुहोस्"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"क्यामेरा"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"फोन"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"सूचना खारेज।"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"सूचना कक्ष।"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"द्रुत सेटिङहरू"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"वर्तमान अनुप्रयोगहरू"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g>।"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>। <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"मोवाइल <xliff:g id="SIGNAL">%1$s</xliff:g>। <xliff:g id="TYPE">%2$s</xliff:g>। <xliff:g id="NETWORK">%3$s</xliff:g>।"</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"प्यानल बन्द गर्नुहोस्"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"थप समय"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"कम समय"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G डेटा बन्द छ"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G डेटा बन्द छ"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"सेलुलर डेटा बन्द छ"</string>
@@ -238,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> प्रयोग गरियो"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी दिँदै"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"कुनै वर्तमान अनुप्रयोगहरू छैनन्"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग जानकारी"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"अनुप्रयोग बन्द गर्न"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोजी गर्नुहोस्"</string>
@@ -258,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> मा तपाईंले आफ्नो सचेतक सुन्नुहुने छैन"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"तल कम जरुरी सूचनाहरू"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"खोल्न पुनः ट्याप गर्नुहोस्"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"अनलक गर्न स्वाप गर्नुहोस्"</string>
<string name="phone_hint" msgid="3101468054914424646">"फोनका लागि दाँया स्वाइप"</string>
<string name="camera_hint" msgid="5241441720959174226">"क्यामेराका लागि बाँया स्वाइप"</string>
@@ -267,17 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"प्राथमिकता"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"सबै"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"चार्ज हुँदै (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> पूर्ण भएसम्म)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"प्रयोगकर्ता थप्नुहोस्"</string>
<string name="user_new_user_name" msgid="426540612051178753">"नयाँ प्रयोगकर्ता"</string>
<string name="guest_nickname" msgid="8059989128963789678">"अतिथि"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+अतिथि"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"अतिथि बन्द"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"अतिथि सत्र बाहिरिंदै छ?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"अतिथि सत्र अन्त्यले स्थानीय डेटा हटाउने छ।"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"पुनः स्वागत, अतिथि!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"के तपाईं एक नयाँ सत्र सुरु गर्न चाहनुहुन्छ?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"हो"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"होइन, धन्यवाद"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"एक मिनेटको लागि"</item>
<item quantity="other" msgid="6924190729213550991">"%d मिनेटको लागि"</item>
@@ -307,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"तपाईं VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") मा जडित हुनुहुन्छ।\n\nतपाईंको VPN सेवा प्रदायकले इमेल, अनुप्रयोगहरू, र सुरक्षित वेबसाइट सहित आफ्नो उपकरण र सञ्जाल गतिविधि निगरानी गर्न सक्छन्।"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"यो उपकरण व्यवस्थित गरिएको छ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nतपाईंको प्रशासनले इमेल, अनुप्रयोग र सुरक्षित वेबसाइटहरू सहित आफ्नो सञ्जाल गतिविधि निगरानी गर्न सक्षम छ। थप जानकारीको लागि, आफ्नो प्रशासन सँग सम्पर्क गर्नुहोस्।\n\nसाथै, तपाईंले एउटा VPN जडान स्थापित गर्न \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" अनुमति दिनुभयो। यो अनुप्रयोगले सञ्जाल गतिविधि पनि निगरानी गर्न सक्छन्।"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"यो उपकरण व्यवस्थित गरिएको छ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nतपाईंको प्रशासनले इमेल, अनुप्रयोग र सुरक्षित वेबसाइटहरू सहित आफ्नो सञ्जाल गतिविधि निगरानी गर्न सक्षम छ। थप जानकारीको लागि, आफ्नो प्रशासन सँग सम्पर्क गर्नुहोस्।\n\nतपाईं VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") मा जडित हुनुहुन्छ। तपाईंको VPN सेवा प्रदायकले आफ्नो सञ्जाल गतिविधि पनि निगरानी गर्न सक्छन्।"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index 746ac59..009d977 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Wissen"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Verwijderen uit lijst"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"App-info"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Geen recente apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Recente apps negeren"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 recente app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Terug"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Startpagina"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Recente apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Zoeken"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefoon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Melding verwijderd."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Meldingenpaneel."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Snelle instellingen."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Recente apps."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Instellingen"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Gebruiker: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobiel <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Deelvenster sluiten"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Meer tijd"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Minder tijd"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G/3G-data zijn uitgeschakeld"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-data zijn uitgeschakeld"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobiele data zijn uitgeschakeld"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> gebruikt"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiet van <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Waarschuwing voor <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Geen recente apps"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"App-informatie"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"app-slot"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"U hoort uw alarm niet om <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Minder urgente meldingen onderaan"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tik nogmaals om te openen"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Veeg omhoog om te ontgrendelen"</string>
<string name="phone_hint" msgid="3101468054914424646">"Veeg naar rechts voor telefoon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Veeg naar links voor camera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioriteit"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alle"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Opladen (vol over <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Gebruiker toevoegen"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nieuwe gebruiker"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gast"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Gast"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Gastmodus verlaten"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Gast verwijderen"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Gastsessie sluiten?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Als u de gastsessie sluit, worden lokale gegevens verwijderd."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Welkom terug, gast!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Wilt u een nieuwe sessie starten?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nee, bedankt"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Eén minuut"</item>
<item quantity="other" msgid="6924190729213550991">"%d minuten"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"U heeft verbinding met een VPN (\'<xliff:g id="APPLICATION">%1$s</xliff:g>\').\n\nUw VPN-provider kan uw apparaat- en netwerkactiviteit bijhouden, waaronder e-mails, apps en beveiligde websites."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Dit apparaat wordt beheerd door:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nUw beheerder kan uw netwerkactiviteit beheren, waaronder e-mails, apps en beveiligde websites. Neem voor meer informatie contact op met uw beheerder.\n\nDaarnaast heeft u \'<xliff:g id="APPLICATION">%2$s</xliff:g>\' toestemming gegeven een VPN-verbinding in te stellen. Deze app kan uw netwerkactiviteit ook controleren."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Dit apparaat wordt beheerd door:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nUw beheerder kan uw netwerkactiviteit beheren, waaronder e-mails, apps en beveiligde websites. Neem voor meer informatie contact op met uw beheerder.\n\nDaarnaast bent u verbonden met een VPN (\'<xliff:g id="APPLICATION">%2$s</xliff:g>\'). Uw VPN-serviceprovider kan uw netwerkactiviteit ook controleren."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 7648a10..6f0e1ec 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Wyczyść"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Usuń z listy"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informacje o aplikacji"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Brak ostatnio uruchomionych aplikacji."</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ukryj ostatnie aplikacje"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ostatnia aplikacja"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Wróć"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Ekran główny"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Ostatnie aplikacje"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Szukaj"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Aparat"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Zamknięto powiadomienie."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Obszar powiadomień."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Szybkie ustawienia."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Ostatnii używane aplikacje."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ustawienia"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Użytkownik: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Sieć komórkowa: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Zamknij panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Więcej czasu"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mniej czasu"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Połączenie danych 2G-3G wyłączone"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Połączenie danych 4G wyłączone"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Komórkowe połączenie danych jest wyłączone"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Wykorzystano <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ostrzeżenie: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Brak ostatnio uruchomionych aplikacji"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacje o aplikacji"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"zablokuj na aplikacji"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Nie usłyszysz alarmu o <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Poniżej widać mniej pilne powiadomienia"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Kliknij ponownie, by otworzyć"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Przesuń w górę, by odblokować"</string>
<string name="phone_hint" msgid="3101468054914424646">"Przesuń w prawo, by przełączyć się na telefon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Przesuń w lewo, by przełączyć się na aparat"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priorytet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Wszystkie"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Ładuje się (pełne naładowanie za <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Dodaj użytkownika"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nowy użytkownik"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gość"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Dodaj gościa"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Zakończ tryb gościa"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Usuń gościa"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Zakończyć sesję gościa?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Zakończenie sesji gościa spowoduje usunięcie danych lokalnych."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Witaj ponownie, gościu!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Chcesz rozpocząć nową sesję?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Tak"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nie, dziękuję"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Przez minutę"</item>
<item quantity="other" msgid="6924190729213550991">"Przez %d min"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Łączysz się z siecią VPN („<xliff:g id="APPLICATION">%1$s</xliff:g>”).\n\nDostawca usługi VPN może monitorować Twoją aktywność na urządzeniu i w sieci, w tym e-maile, aplikacje i bezpieczne strony internetowe."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Urządzeniem zarządza:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministrator ma możliwość monitorowania Twojej aktywności w sieci, w tym e-maili, aplikacji i bezpiecznych witryn. Skontaktuj się z nim, by dowiedzieć się więcej.\n\nDałeś też aplikacji „<xliff:g id="APPLICATION">%2$s</xliff:g>” uprawnienia do skonfigurowania połączenia VPN. Ona również może monitorować aktywność sieciową."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Urządzeniem zarządza:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministrator ma możliwość monitorowania Twojej aktywności w sieci, w tym e-maili, aplikacji i bezpiecznych witryn. Skontaktuj się z nim, by dowiedzieć się więcej.\n\nŁączysz się też z siecią VPN („<xliff:g id="APPLICATION">%2$s</xliff:g>”). Dostawca usługi VPN również może monitorować aktywność sieciową."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index 6453f4d..b7222eb 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Limpar"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Remover da lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informações da aplicação"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Não existem aplicações recentes"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ignorar aplicações recentes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicação recente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Anterior"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Página inicial"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicações recentes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Pesquisar"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Câmara"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telemóvel"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificação ignorada."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Painel de notificações."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Definições rápidas."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicações recentes"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Definições"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilizador <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Dispositivo Móvel <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Fechar painel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mais tempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menos tempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Dados 2G-3G desligados"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Dados 4G desligados"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Dados de rede móvel desligados"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> utilizado(s)"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nenhuma aplicação recente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações da aplicação"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"bloquear numa aplicação"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Não vai ouvir o alarme à(s) <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificações menos urgentes abaixo"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Toque novamente para abrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Deslizar rapidamente com o dedo para cima para desbloquear"</string>
<string name="phone_hint" msgid="3101468054914424646">"Deslize rapidamente para a direita para aceder ao telemóvel"</string>
<string name="camera_hint" msgid="5241441720959174226">"Deslize rapidamente para a esquerda para aceder à câmara"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioridade"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tudo"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"A carregar (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até à carga máxima)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Adicionar utilizador"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Novo utilizador"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Convidado"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Convidado"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Sair de modo convidado"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Remover convidado"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Pretende sair da sessão de convidado?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Ao terminar a sessão de convidado, os dados locais serão removidos."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bem-vindo(a) de volta, caro(a) convidado(a)!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Pretende iniciar uma nova sessão?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sim"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Não, obrigado(a)"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Durante um minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Está ligado a uma VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nO fornecedor de serviços VPN pode monitorizar a atividade do dispositivo e da rede, incluindo emails, aplicações e Websites seguros."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Este dispositivo é gerido por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\no admin. pode monitorizar a atividade da rede, incluindo emails, aplicações e Websites seguros. Para mais informações, contacte o administrador.\n\nAlém disso, deu permissão a \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" para configurar uma ligação VPN. Esta aplicação pode também monitorizar a atividade da rede."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Este dispositivo é gerido por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\no administrador pode monitorizar a atividade da rede, incluindo emails, aplicações e Websites seguros. Para mais informações, contacte o administrador.\n\nAlém disso, está ligado a uma VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). O fornecedor de serviços VPN pode também monitorizar a atividade da rede."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index 9422fa1..51c0526 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Limpar"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Remover da lista"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informações do aplicativo"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nenhum aplicativo recente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Dispensar aplicativos recentes"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicativo recente"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Voltar"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Página inicial"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicativos recentes"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Pesquisar"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Câmera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefone"</string>
@@ -157,7 +159,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificação dispensada."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Aba de notificações."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Configurações rápidas."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicativos recentes."</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuário <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Celular <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +174,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Fechar painel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mais tempo"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Menos tempo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Os dados 2G-3G foram desativados"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Os dados 4G foram desativados"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Os dados da rede celular foram desativados"</string>
@@ -240,7 +247,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Usados: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nenhum app recente"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do aplicativo"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"bloquear no app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
@@ -260,7 +268,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Você não ouvirá o alarme às <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificações menos urgentes abaixo"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Toque novamente para abrir"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Deslize para cima para desbloquear"</string>
<string name="phone_hint" msgid="3101468054914424646">"Deslize para a esquerda para usar o telefone"</string>
<string name="camera_hint" msgid="5241441720959174226">"Deslize para a esquerda para usar a câmera"</string>
@@ -269,17 +278,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioridade"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tudo"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Carregando (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> até concluir)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Adicionar usuário"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Novo usuário"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Convidado"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ convidado"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Remover convidado"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Sair da sessão de convidado?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Sair da sessão de convidado removerá os dados locais."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Bem-vindo, convidado."</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Deseja iniciar uma nova sessão?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Sim"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Não, obrigado."</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Por 1 minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Por %d minutos"</item>
@@ -309,4 +327,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Você está conectado a uma VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nO provedor de serviços de VPN pode monitorar seu dispositivo e a atividade na rede, incluindo e-mails, apps e websites seguros."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Este dispositivo é gerenciado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nO administrador pode monitorar sua atividade na rede, incluindo e-mails, apps e websites seguros. Para mais informações, entre em contato com o administrador.\n\nAlém disso, você autorizou \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" a configurar uma conexão VPN. Esse app também pode monitorar a atividade na rede."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Este dispositivo é gerenciado por:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nO administrador pode monitorar sua atividade na rede, incluindo e-mails, apps e websites seguros. Para mais informações, entre em contato com o administrador.\n\nAlém disso, você está conectado a uma VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). O provedor de serviços de VPN também pode monitorar a atividade na rede."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index 6116b1c..9da5cc5 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ștergeţi"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Eliminaţi din listă"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informaţii despre aplicaţie"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Nu există aplicaţii recente"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Renunţaţi la aplicaţiile recente"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 aplicaţie recentă"</item>
@@ -40,7 +41,7 @@
<string name="invalid_charger_text" msgid="5474997287953892710">"Utilizați numai încărcătorul furnizat."</string>
<string name="battery_low_why" msgid="4553600287639198111">"Setări"</string>
<string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Activați economisirea bateriei?"</string>
- <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Activaţi"</string>
+ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Activați"</string>
<string name="battery_saver_start_action" msgid="5576697451677486320">"Activați economisirea bateriei"</string>
<string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Setări"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Înapoi"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Ecranul de pornire"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Meniu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Aplicaţii recente"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Căutați"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Cameră foto"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notificarea a fost închisă."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Fereastră pentru notificări."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Setări rapide."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Aplicaţii recente"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Utilizatorul <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Semnal mobil: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Închideți panoul"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Mai mult timp"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mai puțin timp"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Datele 2G-3G sunt dezactivate"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Datele 4G sunt dezactivate"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Datele mobile sunt dezactivate"</string>
@@ -179,8 +186,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"Locaţie setată prin GPS"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"Solicitări locație active"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"Ștergeţi toate notificările."</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"Setări"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ecranul se va roti în mod automat."</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ecranul este blocat în orientarea de tip peisaj."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ecranul este blocat în orientarea de tip portret."</string>
@@ -239,7 +245,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> utilizați"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limită de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertizare: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Nicio aplicație recentă"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informații despre aplicație"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"blocare la aplicație"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"căutare"</string>
@@ -259,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Nu veți auzi alarma la <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Notificările mai puțin urgente mai jos"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Atingeți din nou pentru a deschide"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Glisați în sus pentru a debloca"</string>
<string name="phone_hint" msgid="3101468054914424646">"Glisați la dreapta pentru a acesa telefonul"</string>
<string name="camera_hint" msgid="5241441720959174226">"Glisați la stânga pentru a accesa camera foto"</string>
@@ -268,24 +276,28 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritate"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Toate"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Se încarcă (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> până la finalizare)"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"Adăugați un utilizator"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"Utilizator nou"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Invitat"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Invitat"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Închideți invitatul"</string>
+ <!-- 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 (7587460301980067285) -->
<skip />
<!-- no translation found for guest_exit_guest_dialog_message (10255285459589280) -->
<skip />
<!-- no translation found for guest_wipe_session_title (6419439912885956132) -->
<skip />
- <!-- no translation found for guest_wipe_session_message (5369763062345463297) -->
+ <!-- no translation found for guest_wipe_session_message (8476238178270112811) -->
<skip />
- <!-- no translation found for guest_wipe_session_wipe (9154291314115781448) -->
+ <!-- no translation found for guest_wipe_session_wipe (5065558566939858884) -->
<skip />
- <!-- no translation found for guest_wipe_session_dontwipe (850084868661344050) -->
+ <!-- no translation found for guest_wipe_session_dontwipe (1401113462524894716) -->
<skip />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Timp de un minut"</item>
@@ -309,14 +321,13 @@
<string name="vpn_footer" msgid="2388611096129106812">"Rețeaua poate fi monitorizată"</string>
<string name="monitoring_title_device_owned" msgid="7121079311903859610">"Monitorizarea dispozitivului"</string>
<string name="monitoring_title" msgid="169206259253048106">"Monitorizarea rețelei"</string>
- <string name="open_app" msgid="4011771120339160755">"Deschideţi aplicaţia"</string>
+ <string name="open_app" msgid="4011771120339160755">"Deschideți aplicația"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Deconectați rețeaua VPN"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"Acest dispozitiv este administrat de:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratorul vă poate monitoriza activitatea pe dispozitiv și în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate.\n\nPentru mai multe informații, contactați administratorul."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Ați acordat aplicației „<xliff:g id="APPLICATION">%1$s</xliff:g>” permisiunea de a configura o conexiune VPN.\n\nAceastă aplicație vă poate monitoriza activitatea pe dispozitiv și în rețea, inclusiv email-urile, aplicațiile și site-urile securizate."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Sunteți conectat(ă) la o rețea VPN („<xliff:g id="APPLICATION">%1$s</xliff:g>”).\n\nFurnizorul de servicii VPN vă poate monitoriza activitatea pe dispozitiv și în rețea, inclusiv email-urile, aplicațiile și site-urile securizate."</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Dispozitiv administrat de:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratorul vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate. Pentru detalii, contactați administratorul.\n\nAți permis aplicației „<xliff:g id="APPLICATION">%2$s</xliff:g>” să configureze o conexiune VPN. Aplicația vă poate monitoriza activitatea în rețea."</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Dispozitiv administrat de:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratorul vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate. Pentru detalii, contactați administratorul.\n\nSunteți conectat(ă) la o rețea VPN („<xliff:g id="APPLICATION">%2$s</xliff:g>”). Furnizorul de servicii VPN vă poate monitoriza activitatea în rețea."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
<skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Acest dispozitiv este administrat de:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratorul poate să monitorizeze activitatea dvs. în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate. Pentru mai multe informații, contactați administratorul.\n\nDe asemenea, ați acordat aplicației „<xliff:g id="APPLICATION">%2$s</xliff:g>” permisiunea de a configura o conexiune VPN. Aplicația vă poate monitoriza activitatea în rețea."</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Dispozitivul este administrat de:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdministratorul vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile securizate.Pentru mai multe inf., contactați admin.\n\nSunteți conectat(ă) la o rețea VPN („<xliff:g id="APPLICATION">%2$s</xliff:g>”). Furniz. de servicii VPN vă poate monitoriza activit. în rețea."</string>
</resources>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index 5f026c1..d24f356 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Очистить"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Удалить из списка"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"О приложении"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Список недавно использованных приложений пуст."</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Закрыть недавние приложения"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Недавних приложений: 1"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Назад"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Домой"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Меню"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Недавние приложения"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Поиск"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон."</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Уведомление закрыто"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Панель уведомлений"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Быстрые настройки"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Недавние приложения"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Настройки"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Пользователь <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="NETWORK">%2$s</xliff:g>: <xliff:g id="SIGNAL">%1$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобильная сеть: <xliff:g id="NETWORK">%3$s</xliff:g> (<xliff:g id="TYPE">%2$s</xliff:g>, <xliff:g id="SIGNAL">%1$s</xliff:g>)"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Закрыть панель."</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Увеличить продолжительность."</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Уменьшить продолжительность."</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Передача данных 2G/3G отключена"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Передача данных 4G отключена"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Передача мобильных данных отключена"</string>
@@ -181,8 +187,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"Координаты по GPS"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"Есть активные запросы на определение местоположения"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"Удалить все уведомления"</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"Настройки"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран будет поворачиваться автоматически."</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Выбрана только альбомная ориентация экрана."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Выбрана только книжная ориентация экрана."</string>
@@ -241,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Использовано: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ничего не найдено."</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Сведения о приложении"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Блокировать в приложении"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"поиск"</string>
@@ -261,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Следующий будильник: <xliff:g id="ALARM_TIME">%s</xliff:g>. Звук отключен."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Показать менее важные оповещения"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Нажмите ещё раз, чтобы открыть"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Для разблокировки проведите пальцем по экрану"</string>
<string name="phone_hint" msgid="3101468054914424646">"Чтобы открыть приложение \"Телефон\", пролистните вправо"</string>
<string name="camera_hint" msgid="5241441720959174226">"Чтобы включить камеру, пролистните влево"</string>
@@ -270,19 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Приоритет"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Все"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Зарядка батареи (осталось <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"Добавить пользователя"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"Новый пользователь"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Гость"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Добавить гостя"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Выйти из гостевого режима"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Удалить аккаунт гостя"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Выйти из гостевого режима?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"При выходе из гостевого режима локальные данные будут удалены."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Рады видеть вас снова!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Начать новый сеанс?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Да"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Нет"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 мин."</item>
<item quantity="other" msgid="6924190729213550991">"%d мин."</item>
@@ -307,12 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"Отслеживание сетей"</string>
<string name="open_app" msgid="4011771120339160755">"Открыть приложение"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"Отключить VPN"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
- <skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"Этим устройством управляет организация:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор может отслеживать ваши действия в Интернете, включая работу с электронной почтой, приложениями и защищенными веб-сайтами.\n\nЗа дополнительной информацией обратитесь к администратору."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"Вы разрешили приложению \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" подключаться к сети VPN.\n\nЭто приложение может отслеживать использование устройства и ваши действия в Интернете, включая работу с электронной почтой, приложениями и защищенными веб-сайтами."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Устройство подключено к сети VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nПоставщик услуг VPN может отслеживать ваши действия в Интернете, включая работу с электронной почтой, приложениями и защищенными веб-сайтами."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Этим устройством управляет организация:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор может отслеживать вашу работу с электронной почтой, приложениями и защищенными веб-сайтами. Обратитесь к нему за дополнительной информацией.\n\nВаши действия в сети также доступны приложению \"<xliff:g id="APPLICATION">%2$s</xliff:g>\", которому вы разрешили подключаться к сети VPN."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Этим устройством управляет организация:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор может отслеживать вашу работу с электронной почтой, приложениями и защищенными веб-сайтами. Обратитесь к нему за дополнительной информацией.\n\nУстройство подключено к сети VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Ваши действия также доступны поставщику услуг VPN."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml
index 30717f2..18601a0 100644
--- a/packages/SystemUI/res/values-si-rLK/strings.xml
+++ b/packages/SystemUI/res/values-si-rLK/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"හිස් කරන්න"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ලැයිස්තුවෙන් ඉවත් කරන්න"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"යෙදුම් තොරතුරු"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"මෑත උපාංග නැත"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"මෑත යෙදුම් ඉවතලන්න"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"මෑත යෙදුම් 1 ක්"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"ආපසු"</string>
<string name="accessibility_home" msgid="8217216074895377641">"මුල් පිටුව"</string>
<string name="accessibility_menu" msgid="316839303324695949">"මෙනුව"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"මෑත යෙදුම්"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"සොයන්න"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"කැමරාව"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"දුරකථනය"</string>
@@ -155,7 +157,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"දැනුම්දීම නිෂ්ප්රභා කරඇත."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"දැනුම්දීම් ආවරණය."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"ක්ෂණික සැකසීම්."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"මෑත කාලීන යෙදුම්."</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"පරිශීලකයා <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"ජංගම <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +172,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"පැනලය වහන්න"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"වේලාව වැඩියෙන්"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"වේලාව අඩුවෙන්"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G දත්ත අක්රියයි"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G දත්ත අක්රියයි"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"සෙලියුලර් දත්ත අක්රියයි"</string>
@@ -179,8 +186,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"GPS මඟින් ස්ථානය සකසා ඇත"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"පිහිටීම් ඉල්ලීම් සක්රියයි"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"සියලු දැනුම්දීම් හිස් කරන්න."</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"සැකසීම්"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"තිරය ස්වයංක්රීයව කරකැවේ."</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"තිරය තිරස් දිශානතියෙහි අගුළු දමා ඇත."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"තිරය සිරස් දිශානතිය තුළ අගුළු වැටී ඇත."</string>
@@ -239,9 +245,10 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> භාවිතා කර තිබේ"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> සීමිත"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> අවවාද කිරීම"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"මෑත යෙදුම් නැත"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"යෙදුම් තොරතුරු"</string>
- <string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"අගුළු යෙදුම"</string>
+ <string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"යෙදුමට අඟුළු දැමීම"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"සෙවීම"</string>
<string name="expanded_header_battery_charged" msgid="5945855970267657951">"අරෝපිතයි"</string>
<string name="expanded_header_battery_charging" msgid="205623198487189724">"ආරෝපණය වෙමින්"</string>
@@ -259,7 +266,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> හි තිබෙන ඔබගේ සීනුව ඔබට ඇසෙන්නේ නැත"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"හදිසිය අඩු දැනුම් දීම් පහත"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"විවෘත කිරීමට නැවත තට්ටු කරන්න"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"අගුළු ඇරීමට ස්වයිප් කරන්න."</string>
<string name="phone_hint" msgid="3101468054914424646">"දුරකථන සඳහා දකුණට ස්වයිප් කරන්න"</string>
<string name="camera_hint" msgid="5241441720959174226">"කැමරාව සඳහා දකුණට ස්වයිප් කරන්න"</string>
@@ -268,19 +276,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ප්රමුඛතාව"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"සියලු"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ආරෝපණය වෙමින් (සම්පුර්ණ වන තෙක් <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"පරිශීලකයෙක් එක් කරන්න"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"නව පරිශීලකයා"</string>
<string name="guest_nickname" msgid="8059989128963789678">"අමුත්තා"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ අමුත්තා"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"අමුත්තා පිටවීම"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"අමුත්තාගේ සැසියෙන් පිටවෙයිද?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"අමුත්තාගේ සැසිය අවසන් කිරීමෙන් පෙදෙසි දත්ත සියල්ලම පිට කරයි."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"නැවත සාදරයෙන් පිළිගනිමු, අමුත්තා!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"අලුත් සැසියක් ආරම්භ කිරීමට ඔබට අවශ්යද?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ඔව්"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"එපා, ස්තූතියි"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"විනාඩි එකක් සඳහා"</item>
<item quantity="other" msgid="6924190729213550991">"විනාඩි %d සඳහා"</item>
@@ -305,12 +320,11 @@
<string name="monitoring_title" msgid="169206259253048106">"ජාල නිරීක්ෂණය"</string>
<string name="open_app" msgid="4011771120339160755">"යෙදුම විවෘත කරන්න"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"VPN විසන්ධි කරන්න"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
- <skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"මෙම උපාංගය කළමනාකරණය කරනු ලබන්නේ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nඊ-මේල්, යෙදුම්, සහ ආරක්ෂාකාරී වෙබ් අඩවි ඇතුළු, ඔබගේ ජාල ක්රියාකාරකම නිරීක්ෂණය කිරීමට ඔබගේ පරිපාලකට හැක.\n\nවැඩිදුර විස්තර සඳහා, ඔබගේ පරිපාලක අමතන්න."</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"VPN සම්බන්ධතාව සකස් කරගැනීමට \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" අවසර ඔබ දෙන ලදි.\n\nඊ-තැපැල්, යෙදුම්, සහ අරක්ෂිත වෙබ් අඩවි ඇතුළුව ඔබගේ ජාලයේ ක්රියාකාරකම් නිරීක්ෂණය කිරීමට මෙම යෙදුමට හැකිය."</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") වෙත ඔබ සම්බන්ධ වී තිබේ.\n\nඊ-තැපැල්, යෙදුම්, සහ අරක්ෂිත වෙබ් අඩවි ඇතුළුව ඔබගේ VPN සේවාවේ සපයන්නාට ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැක."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"මෙම උපාංගය පාලනය කරන්නේ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nඊ-තැපැල්, යෙදුම්, සහ අරක්ෂිත වෙබ් අඩවි ඇතුළුව ඔබගේ ජාලයේ ක්රියාකාරකම් නිරීක්ෂණය කිරීමට ඔබගේ පාලකයාට හැකියාව තිබේ. වැඩිපුර තොරතුරු සඳහා ඔබගේ පාලකයා සම්බන්ධ කර ගන්න.\n\nතවද, VPN සම්බන්ධතාව සකස් කරගැනීමට \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" අවසර ඔබ දෙන ලදි. මෙම යෙදුම ජාල ක්රියාකාරකම් නිරීක්ෂණය කරයි."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"මෙම උපාංගය පාලනය කරන්නේ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nඊ-තැපැල්, යෙදුම්, සහ අරක්ෂිත වෙබ් අඩවි ඇතුළුව ඔබගේ ජාලයේ ක්රියාකාරකම් නිරීක්ෂණය කිරීමට ඔබගේ පාලකයාට හැකියාව තිබේ. වැඩිපුර තොරතුරු සඳහා ඔබගේ පාලකයා සම්බන්ධ කර ගන්න.\n\nතවද, VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") වෙත ඔබ සම්බන්ධ වී තිබේ. තවද ඔබගේ VPN සේවාවේ සපයන්නාට ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැක."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index 70bea6f..89235b0 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Vymazať"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Odstrániť zo zoznamu"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informácie o aplikácii"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Žiadne nedávne aplikácie"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Zatvoriť nedávne aplikácie"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 nová aplikácia"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Späť"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Plocha"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nové aplikácie"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Hľadať"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotoaparát"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefón"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Upozornenie bolo zrušené."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Panel upozornení."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Rýchle nastavenia."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Nedávne aplikácie"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavenia"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Používateľ: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Zavrieť panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Dlhší čas"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Kratší čas"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"dáta 2G–3G sú vypnuté"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"dáta 4G sú vypnuté"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobilné dáta sú vypnuté"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Využité: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornenie pri <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Žiadne nedávne aplikácie"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Informácie o aplikácii"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"Uzamknutie v aplikácii"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Váš budík o <xliff:g id="ALARM_TIME">%s</xliff:g> sa nespustí"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Menej naliehavé upozornenia sa nachádzajú nižšie"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Upozornenie otvoríte opätovným klepnutím"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Zariadenie odomknete prejdením prstom nahor"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefón otvoríte prejdením prstom doľava"</string>
<string name="camera_hint" msgid="5241441720959174226">"Fotoaparát otvoríte prejdením prstom doľava"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Priorita"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Všetky"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Nabíja sa (úplné nabitie o <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Pridať používateľa"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nový používateľ"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Hosť"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Pridať hosťa"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Ukončiť režim hosťa"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Odstrániť hosťa"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Chcete ukončiť reláciu hosťa?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Ukončením relácie hosťa sa odstránia mieste údaje."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Hosť, vitajte späť!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Chcete spustiť novú reláciu?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Áno"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nie, ďakujem"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Na jednu minútu"</item>
<item quantity="other" msgid="6924190729213550991">"Na %d min"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Ste pripojený/-á k sieti VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nPoskytovateľ služby VPN môže sledovať vaše zariadenie a aktivitu v sieti vrátane správ, aplikácií a zabezpečených webových stránok."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Toto zariadenie spravuje organizácia:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávca môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok. Ďalšie informácie získate od svojho správcu.\n\nZároveň ste aplikácii <xliff:g id="APPLICATION">%2$s</xliff:g> povolili nastaviť pripojenie VPN. Táto aplikácia môže tiež sledovať vašu aktivitu v sieti."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Toto zariadenie spravuje organizácia:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávca môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok. Ďalšie informácie získate od svojho správcu.\n\nZároveň ste pripojený/-á aj k sieti VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Poskytovateľ služby VPN môže tiež sledovať vašu aktivitu v sieti."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 0181c49..22fb1c6 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Počisti"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Odstrani s seznama"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Podatki o programu"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Ni nedavnih programov"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Zapre nedavne programe"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 nedavni program"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Nazaj"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Začetni zaslon"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Meni"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Nedavni programi"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Iskanje"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Fotoaparat"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Obvestilo je bilo odstranjeno."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Zaslon z obvestili."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Hitre nastavitve."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Nedavne aplikacije."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Nastavitve"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Uporabnik: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobilni telefon: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Zapri podokno"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Daljši čas"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Krajši čas"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Prenos podatkov v omrežjih 2G/3G je izklopljen"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Prenos podatkov v omrežjih 4G je izklopljen"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Prenos podatkov v mobilnih omrežjih je izklopljen"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Porabljeno: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Omejitev: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Opozorilo – <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Ni nedavnih aplikacij"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Podatki o aplikaciji"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"zakleni v aplikacijo"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Alarma ob <xliff:g id="ALARM_TIME">%s</xliff:g> ne boste slišali"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Manj nujna obvestila spodaj"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Znova se dotaknite, da odprete"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Povlecite, da odklenete"</string>
<string name="phone_hint" msgid="3101468054914424646">"Povlecite v desno za telefon"</string>
<string name="camera_hint" msgid="5241441720959174226">"Povlecite v levo za fotoaparat"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prednost"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Vse"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Polnjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do napolnjenosti)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Dodajanje uporabnika"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Nov uporabnik"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gost"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Dodajanje gosta"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Izhod iz načina za goste"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Odstranitev gosta"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Želite končati sejo gosta?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Če končate sejo gosta, bodo lokalni podatki izbrisani."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Znova pozdravljeni, gost!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Želite začeti novo sejo?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Da"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ne, hvala"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Za eno minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Za %d min"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Povezani ste v omrežje VPN (»<xliff:g id="APPLICATION">%1$s</xliff:g>«).\n\nPonudnik omrežja VPN lahko nadzira vašo napravo in dejavnost v omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"To napravo upravlja:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSkrbnik lahko nadzira vašo dejavnost v omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti. Če želite več informacij, se obrnite na skrbnika.\n\nPoleg tega ste aplikaciji »<xliff:g id="APPLICATION">%2$s</xliff:g>« dovolili vzpostavitev povezave z omrežjem VPN. Vašo dejavnost v omrežju lahko nadzoruje tudi ta aplikacija."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"To napravo upravlja:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSkrbnik lahko nadzira vašo dejavnost v omrežju, vključno z e-pošto, aplikacijami in varnimi spletnimi mesti. Če želite več informacij, se obrnite na skrbnika.\n\nPoleg tega ste povezani v omrežje VPN (»<xliff:g id="APPLICATION">%2$s</xliff:g>«). Vašo dejavnost v omrežju lahko nadzira tudi ponudnik omrežja VPN."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index edc7876..0f305c5 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Обриши"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Уклањање са листе"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Информације о апликацији"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Нема недавних апликација"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Одбаци недавне апликације"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 недавна апликација"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Назад"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Почетна"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Мени"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Недавне апликације"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Претражите"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Обавештење је одбачено."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Прозор са обавештењима."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Брза подешавања."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Недавне апликације."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Подешавања"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Корисник: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобилна мрежа: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Затворите таблу"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Више времена"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Мање времена"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G–3G подаци су искључени"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G подаци су искључени"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Мобилни пренос података је искључен"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Искористили сте <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничење од <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Упозорење за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Нема недавних апликација"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Информације о апликацији"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"закључај апликацију"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"претражи"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Нећете чути аларм у <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Мање хитна обавештења су у наставку"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Додирните поново да бисте отворили"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Превуците нагоре да бисте откључали"</string>
<string name="phone_hint" msgid="3101468054914424646">"Превуците удесно за телефон"</string>
<string name="camera_hint" msgid="5241441720959174226">"Превуците улево за камеру"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Приоритет"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Све"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Пуњење (пун је за <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Додај корисника"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Нови корисник"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Гост"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Гост"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Изађи из режима госта"</string>
- <string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Желите ли да изађете из сесије за госта?"</string>
- <string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Изласком из сесије за госта уклонићете локалне податке."</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Уклони госта"</string>
+ <string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Желите ли да изађете из сесије госта?"</string>
+ <string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Изласком из сесије госта уклонићете локалне податке."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Добро дошли назад, госте!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Желите ли да започнете нову сесију?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Да"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Не, хвала"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Један минут"</item>
<item quantity="other" msgid="6924190729213550991">"%d мин"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Повезани сте са VPN-ом („<xliff:g id="APPLICATION">%1$s</xliff:g>“).\n\nДобављач VPN услуге може да надгледа уређај и мрежне активности, укључујући имејлове, апликације и безбедне веб-сајтове."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Овим уређајем управља:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор може да надгледа мрежне активности, укључујући имејлове, апликације и безбедне веб-сајтове. Више информација потражите од администратора.\n\nДали сте и дозволу апликацији <xliff:g id="APPLICATION">%2$s</xliff:g> да подешава VPN везу. И та апликација може да надгледа мрежне активности."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Овим уређајем управља:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдминистратор може да надгледа мрежне активности, укључујући имејлове, апликације и безбедне веб-сајтове. Више информација потражите од администратора.\n\nПовезани сте и са VPN-ом („<xliff:g id="APPLICATION">%2$s</xliff:g>“). И добављач VPN услуге може да надгледа мрежне активности."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index 6a81f30..bfa9fdc 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ta bort"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Ta bort från listan"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Info om appen"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Inga aktiva appar"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Avvisa nya appar"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ny app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Tillbaka"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Startsida"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Meny"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Senaste apparna"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Sök"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Mobil"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Meddelandet ignorerades."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Meddelandepanel."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Snabbinställningar."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Senaste apparna"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Inställningar"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Användare <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Stäng panelen"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Längre tid"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Kortare tid"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-/3G-data har inaktiverats"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G-data har inaktiverats"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobildata har inaktiverats"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> används"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Gräns: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Varning <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Inga aktiva appar"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformation"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lås till app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sök"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Alarmet kommer inte att höras kl. <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Mindre brådskande aviseringar nedan"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tryck igen för att öppna"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Dra uppåt om du vill låsa upp"</string>
<string name="phone_hint" msgid="3101468054914424646">"Dra åt höger om du vill visa telefonen"</string>
<string name="camera_hint" msgid="5241441720959174226">"Dra åt vänster om du vill visa kameran"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prioritet"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Alla"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Laddar (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> tills batteriet är fulladdat)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Lägg till användare"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Ny användare"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Gäst"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Lägg till gäst"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Avsluta gäst"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Ta bort gäst"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Vill du avsluta gästsessionen?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Om du avslutar gästsessionen kommer lokala uppgifter att tas bort."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Välkommen tillbaka gäst!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Vill du starta en ny session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ja"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Nej tack"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"I en minut"</item>
<item quantity="other" msgid="6924190729213550991">"I %d minuter"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Du är ansluten till ett VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nVPN-tjänsteleverantören kan övervaka enheten och din nätverksaktivitet, inklusive e-post, appar och säkra webbplatser."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Den här enheten administreras av:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administratör kan övervaka din nätverksaktivitet, inklusive e-post, appar och säkra webbplatser. Kontakta din administratör för mer information.\n\nDu har också gett <xliff:g id="APPLICATION">%2$s</xliff:g> tillåtelse att skapa en VPN-anslutning. Även den här appen kan övervaka nätverksaktivitet."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Den här enheten administreras av:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nDin administratör kan övervaka din nätverksaktivitet, inklusive e-post, appar och säkra webbplatser. Kontakta din administratör för mer information.\n\nDu är även ansluten till VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Även din VPN-tjänsteleverantör kan övervaka nätverksaktiviteten."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index d46dd5c..32b1c28 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Futa"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Ondoa kwenye orodha"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Taarifa za programu-matumizi"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Hakuna programu za sasa"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ondosha programu za hivi karibuni"</string>
<!-- String.format failed for translation -->
<!-- no translation found for status_bar_accessibility_recent_apps:other (1040784359794890744) -->
@@ -78,7 +79,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Nyuma"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Nyumbani"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menyu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Programu za hivi karibuni"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Tafuta"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Simu"</string>
@@ -153,7 +155,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Arifa imetupwa."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Kivuli cha arifa."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Mipangilio ya haraka."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Programu za hivi karibuni."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Mipangilio"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Mtumiaji <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Simu <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -165,6 +169,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Funga paneli ya maelezo"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Muda zaidi"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Muda kidogo"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Data ya 2G-3G imezimwa"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Data ya 4G imezimwa"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Data ya simu ya mkononi imezimwa"</string>
@@ -236,7 +242,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> imetumika"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kikomo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Onyo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Hakuna programu za karibuni"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Maelezo ya Programu"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lazimisha kutumia programu"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string>
@@ -256,7 +263,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Hutasikia kengele yako ifikapo <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>+"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Arifa zisizo za dharura sana ziko hapo chini"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Gonga tena ili ufungue"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Telezesha kidole ili ufungue"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telezesha kidole kulia ili ufikie simu"</string>
<string name="camera_hint" msgid="5241441720959174226">"Telezesha kidole kushoto ili ufikie kamera"</string>
@@ -265,17 +273,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Kipaumbele"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Zote"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Inachaji (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ijae)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Ongeza mtumiaji"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Mtumiaji mpya"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Aliyealikwa"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Aliyealikwa"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Ondoa aliyealikwa"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Ondoa aliyealikwa"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Je, ungependa kuondoa kipindi cha aliyealikwa?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Kuondoa kipindi cha aliyealikwa kutaondoa data yako."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Karibu tena, mwalikwa!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Je, unataka kuanzisha kipindi kipya?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ndiyo"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Hapana, asante"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Kwa dakika moja"</item>
<item quantity="other" msgid="6924190729213550991">"Kwa dakika %d"</item>
@@ -302,7 +318,9 @@
<string name="disconnect_vpn" msgid="1324915059568548655">"Ondoa VPN"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"Kifaa kinasimamiwa na:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nMsimamizi wako anaweza kufuatilia shughuli ya kifaa na mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti salama.\n\nKwa maelezo zaidi, wasiliana na msimamizi wako."</string>
<string name="monitoring_description_vpn" msgid="7288268682714305659">"Umeruhusu \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" isanidi muunganisho wa VPN.\n\nProgramu hii inaweza kufuatilia shughuli za kifaa na mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti salama."</string>
- <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Umeunganishwa kwenye VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nMtoa huduma wako wa VPN anaweza kufuatilia kifaa shughuli ya kifaa na mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti salama"</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Umeunganishwa kwenye VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nMtoa huduma wako wa VPN anaweza kufuatilia kifaa na shughuli za kifaa na mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti salama."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Kifaa hiki kinasimamiwa na:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nMsimamizi anaweza kufuatilia shughuli za mtandao wako ikiwa ni pamoja na barua pepe, programu na tovuti salama. Kwa maelezo zaidi, wasiliana na msimamizi wako.\n\nPia, umeruhusu \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" isanidi muunganisho wa VPN. Programu hii pia inaweza kufuatilia shughuli za mtandao wako."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Kifaa hiki kinasimamiwa na:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nMsimamizi anaweza kufuatilia shughuli za mtandao wako ikiwa ni pamoja na barua pepe, programu na tovuti salama. Kwa maelezo zaidi, wasiliana na msimamizi wako.\n\nPia, umeunganishwa kwenye VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Mtoa huduma wako wa VPN pia anaweza kufuatilia shughuli za mtandao."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
index 5367fbc..2c22cef 100644
--- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -27,4 +27,6 @@
<dimen name="keyguard_clock_notifications_margin_min">36dp</dimen>
<dimen name="keyguard_clock_notifications_margin_max">36dp</dimen>
+
+ <dimen name="keyguard_indication_margin_bottom">80dp</dimen>
</resources>
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index 7cdc078..9901e44 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -79,4 +79,6 @@
<!-- The width of the region on the left/right edge of the screen for performing the camera/
phone hints. -->
<dimen name="edge_tap_area_width">80dp</dimen>
+
+ <dimen name="keyguard_indication_margin_bottom">90dp</dimen>
</resources>
diff --git a/packages/SystemUI/res/drawable/trust_circle.xml b/packages/SystemUI/res/values-sw720dp-land/config.xml
similarity index 77%
copy from packages/SystemUI/res/drawable/trust_circle.xml
copy to packages/SystemUI/res/values-sw720dp-land/config.xml
index 89f4a0b..1b50288 100644
--- a/packages/SystemUI/res/drawable/trust_circle.xml
+++ b/packages/SystemUI/res/values-sw720dp-land/config.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
@@ -15,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
+<resources>
+ <integer name="keyguard_max_notification_count">4</integer>
+</resources>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="ring"
- android:innerRadius="24dp" android:thickness="1dp">
- <solid android:color="#66ffffff" />
-</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
index 2532dd6..511d45f 100644
--- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
@@ -19,5 +19,5 @@
min value is used when no notifications are displaying, and the max value is when the
highest possible number of notifications are showing. -->
<fraction name="keyguard_clock_y_fraction_max">35%</fraction>
- <fraction name="keyguard_clock_y_fraction_min">20%</fraction>
+ <fraction name="keyguard_clock_y_fraction_min">24%</fraction>
</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml
index 57d5e98..6c47bdc7 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"அழி"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"பட்டியலில் இருந்து அகற்று"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"பயன்பாட்டுத் தகவல்"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"சமீபத்திய பயன்பாடுகள் எதுவுமில்லை"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"சமீபத்திய பயன்பாடுகளை நிராகரி"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 சமீபத்திய பயன்பாடு"</item>
@@ -38,11 +39,11 @@
<string name="invalid_charger" msgid="4549105996740522523">"USB மூலம் சார்ஜ் செய்வது ஆதரிக்கப்படவில்லை.\nவழங்கப்பட்ட சார்ஜரை மட்டும் பயன்படுத்தவும்."</string>
<string name="invalid_charger_title" msgid="3515740382572798460">"USB சார்ஜிங் ஆதரிக்கப்படவில்லை."</string>
<string name="invalid_charger_text" msgid="5474997287953892710">"வழங்கப்பட்ட சார்ஜரை மட்டும் பயன்படுத்துக."</string>
- <string name="battery_low_why" msgid="4553600287639198111">"அமைப்புகள்"</string>
+ <string name="battery_low_why" msgid="4553600287639198111">"அமைப்பு"</string>
<string name="battery_saver_confirmation_title" msgid="5299585433050361634">"பேட்டரி சேமிப்பானை இயக்கவா?"</string>
<string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"இயக்கு"</string>
<string name="battery_saver_start_action" msgid="5576697451677486320">"பேட்டரி சேமிப்பானை இயக்கு"</string>
- <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"அமைப்புகள்"</string>
+ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"அமைப்பு"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"வைஃபை"</string>
<string name="status_bar_settings_airplane" msgid="4879879698500955300">"விமானப் பயன்முறை"</string>
<string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"திரையைத் தானாகச் சுழற்று"</string>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"பின்செல்"</string>
<string name="accessibility_home" msgid="8217216074895377641">"முகப்பு"</string>
<string name="accessibility_menu" msgid="316839303324695949">"மெனு"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"சமீபத்திய பயன்பாடுகள்"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"தேடு"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"கேமரா"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"மொபைல்"</string>
@@ -141,7 +143,7 @@
<string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"புளூடூத் இணைப்பு முறை."</string>
<string name="accessibility_airplane_mode" msgid="834748999790763092">"விமானப் பயன்முறை."</string>
<string name="accessibility_battery_level" msgid="7451474187113371965">"பேட்டரி சக்தி <xliff:g id="NUMBER">%d</xliff:g> சதவிகிதம் உள்ளது."</string>
- <string name="accessibility_settings_button" msgid="799583911231893380">"கணினி அமைப்புகள்."</string>
+ <string name="accessibility_settings_button" msgid="799583911231893380">"கணினி அமைப்பு."</string>
<string name="accessibility_notifications_button" msgid="4498000369779421892">"அறிவிப்புகள்."</string>
<string name="accessibility_remove_notification" msgid="3603099514902182350">"அறிவிப்பை அழி."</string>
<string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS இயக்கப்பட்டது."</string>
@@ -154,8 +156,10 @@
<string name="accessibility_recents_item_launched" msgid="7616039892382525203">"<xliff:g id="APP">%s</xliff:g> ஐத் தொடங்குகிறது."</string>
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"அறிவிப்பு நிராகரிக்கப்பட்டது."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"அறிவிப்பு விவரம்."</string>
- <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"உடனடி அமைப்புகள்."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"சமீபத்திய பயன்பாடுகள்."</string>
+ <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"உடனடி அமைப்பு."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"அமைப்புகள்"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"பயனர் <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"மொபைல் <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"பேனலை மூடு"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"நேரத்தை அதிகரி"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"நேரத்தைக் குறை"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G தரவு முடக்கப்பட்டது"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G தரவு முடக்கப்பட்டது"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"செல்லுலார் தரவு முடக்கப்பட்டது"</string>
@@ -204,7 +210,7 @@
<string name="quick_settings_media_device_label" msgid="1302906836372603762">"மீடியா சாதனம்"</string>
<string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string>
<string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"அவசரகால அழைப்புகள் மட்டும்"</string>
- <string name="quick_settings_settings_label" msgid="5326556592578065401">"அமைப்புகள்"</string>
+ <string name="quick_settings_settings_label" msgid="5326556592578065401">"அமைப்பு"</string>
<string name="quick_settings_time_label" msgid="4635969182239736408">"நேரம்"</string>
<string name="quick_settings_user_label" msgid="5238995632130897840">"நான்"</string>
<string name="quick_settings_user_title" msgid="4467690427642392403">"பயனர்"</string>
@@ -223,7 +229,7 @@
<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"தானியங்கு"</string>
<string name="quick_settings_inversion_label" msgid="8790919884718619648">"வண்ணங்களை மாற்று"</string>
<string name="quick_settings_color_space_label" msgid="853443689745584770">"வண்ணத்தைச் சரிப்படுத்தும் முறை"</string>
- <string name="quick_settings_more_settings" msgid="326112621462813682">"மேலும் அமைப்புகள்"</string>
+ <string name="quick_settings_more_settings" msgid="326112621462813682">"மேலும் அமைப்பு"</string>
<string name="quick_settings_done" msgid="3402999958839153376">"முடிந்தது"</string>
<string name="quick_settings_connected" msgid="1722253542984847487">"இணைக்கப்பட்டது"</string>
<string name="quick_settings_connecting" msgid="47623027419264404">"இணைக்கிறது..."</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"பயன்படுத்தியது - <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> வரம்பு"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> எச்சரிக்கை"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"சமீபத்திய பயன்பாடுகள் எதுவுமில்லை"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"பயன்பாட்டு தகவல்"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"லாக்-டு-ஆப்"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"தேடு"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> க்கு அலாரத்தைக் கேட்க மாட்டீர்கள்"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"அவசர நிலைக் குறைவான அறிவிப்புகள் கீழே உள்ளன"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"திறக்க, மீண்டும் தட்டவும்"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"திறக்க, மேலே ஸ்வைப் செய்யவும்"</string>
<string name="phone_hint" msgid="3101468054914424646">"ஃபோனுக்கு, வலப்புறம் ஸ்வைப் செய்க"</string>
<string name="camera_hint" msgid="5241441720959174226">"கேமராவிற்கு இடப்புறம் ஸ்வைப் செய்க"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"முன்னுரிமை"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"எல்லாம்"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"சார்ஜாகிறது (முழு சார்ஜிற்கு <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ஆகும்)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"பயனரைச் சேர்"</string>
<string name="user_new_user_name" msgid="426540612051178753">"புதியவர்"</string>
<string name="guest_nickname" msgid="8059989128963789678">"அழைக்கப்பட்டவர்"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ அழைக்கப்பட்டவர்"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"விருந்தினரிலிருந்து வெளியேறு"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"அழைக்கப்பட்டவரை அகற்று"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"விருந்தினர் அமர்விலிருந்து வெளியேறவா?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"விருந்தினர் அமர்விலிருந்து வெளியேறுவது அகத் தரவை அகற்றும்."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"வரவேற்கிறோம்!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"புதிய அமர்வைத் தொடங்க விருப்பமா?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ஆம்"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"வேண்டாம், நன்றி"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ஒரு நிமிடம்"</item>
<item quantity="other" msgid="6924190729213550991">"%d நிமிடங்கள்"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") உடன் இணைக்கப்பட்டீர்கள்.\n\nமின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் பாதுகாப்பான இணையதளங்கள் உள்ளிட்ட சாதனம் மற்றும் நெட்வொர்க் செயல்பாட்டை உங்கள் VPN சேவை வழங்குநரால் கண்காணிக்க முடியும்."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"சாதனத்தை நிர்வகிப்பது:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nமின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் பாதுகாப்பான இணையதளங்கள் உட்பட நெட்வொர்க் செயல்பாட்டை உங்கள் நிர்வாகியால் கண்காணிக்க முடியும். மேலும் தகவலுக்கு உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.\n\nமேலும் VPN இணைப்பை அமைக்க, \"<xliff:g id="APPLICATION">%2$s</xliff:g>\"க்கு அனுமதி வழங்கியுள்ளீர்கள். இந்தப் பயன்பாட்டினால் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"சாதனத்தை நிர்வகிப்பது:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nமின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் பாதுகாப்பான இணையதளங்கள் உட்பட நெட்வொர்க் செயல்பாட்டை உங்கள் நிர்வாகியால் கண்காணிக்க முடியும். மேலும் தகவலுக்கு உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.\n\nமேலும் (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") உடன் இணைக்கப்பட்டீர்கள். VPN சேவை வழங்குநரும் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml
index 1073638..42fc147 100644
--- a/packages/SystemUI/res/values-te-rIN/strings.xml
+++ b/packages/SystemUI/res/values-te-rIN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"క్లియర్ చేయండి"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"జాబితా నుండి తీసివేయండి"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"అనువర్తన సమాచారం"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ఇటీవలి అనువర్తనాలు లేవు"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ఇటీవలి అనువర్తనాలను తీసివేయండి"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ఇటీవలి అనువర్తనం"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"వెనుకకు"</string>
<string name="accessibility_home" msgid="8217216074895377641">"హోమ్"</string>
<string name="accessibility_menu" msgid="316839303324695949">"మెను"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"ఇటీవలి అనువర్తనాలు"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"శోధించు"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"కెమెరా"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"ఫోన్"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"నోటిఫికేషన్ తీసివేయబడింది."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"నోటిఫికేషన్ షేడ్."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"శీఘ్ర సెట్టింగ్లు."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"ఇటీవలి అనువర్తనాలు."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"సెట్టింగ్లు"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"వినియోగదారు <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"మొబైల్ <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ప్యానెల్ని మూసివేయి"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"ఎక్కువ సమయం"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"తక్కువ సమయం"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G డేటా ఆఫ్లో ఉంది"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G డేటా ఆఫ్లో ఉంది"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"సెల్యూలార్ డేటా ఆఫ్లో ఉంది"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> వినియోగించబడింది"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> పరిమితి"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> హెచ్చరిక"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ఇటీవలి అనువర్తనాలు ఏవీ లేవు"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"అనువర్తన సమాచారం"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"లాక్ టు యాప్"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"శోధించు"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"మీరు <xliff:g id="ALARM_TIME">%s</xliff:g>కి సెట్ చేసిన అలారం మీకు వినిపించదు"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"తక్కువ అత్యవసర నోటిఫికేషన్లు దిగువన"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"తెరవడానికి మళ్లీ నొక్కండి"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"అన్లాక్ చేయడానికి ఎగువకు స్వైప్ చేయండి"</string>
<string name="phone_hint" msgid="3101468054914424646">"ఫోన్ కోసం కుడివైపుకి స్వైప్ చేయండి"</string>
<string name="camera_hint" msgid="5241441720959174226">"కెమెరా కోసం ఎడమవైపుకి స్వైప్ చేయండి"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ప్రాధాన్యత"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"అన్నిటికీ"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"ఛార్జ్ అవుతోంది (పూర్తిగా నిండటానికి <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"వినియోగదారుని జోడించండి"</string>
<string name="user_new_user_name" msgid="426540612051178753">"కొత్త వినియోగదారు"</string>
<string name="guest_nickname" msgid="8059989128963789678">"అతిథి"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ అతిథి"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"అతిథి మోడ్ నుండి నిష్క్రమించండి"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"అతిథిని తీసివేయండి"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"అతిథి సెషన్ నుండి నిష్క్రమిస్తున్నారా?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"అతిథి సెషన్ నుండి నిష్క్రమించడం వలన స్థానిక డేటా తీసివేయబడుతుంది."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"పునఃస్వాగతం, అతిథి!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"మీరు కొత్త సెషన్ను ప్రారంభించాలనుకుంటున్నారా?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"అవును"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"వద్దు, ధన్యవాదాలు"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ఒక నిమిషానికి"</item>
<item quantity="other" msgid="6924190729213550991">"%d నిమిషాలకి"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"మీరు VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\")కి కనెక్ట్ చేయబడ్డారు.\n\nమీ VPN సేవా ప్రదాత ఇమెయిల్లు, అనువర్తనాలు మరియు సురక్షిత వెబ్సైట్లతో సహా మీ పరికరాన్ని మరియు నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలరు."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ఈ పరికరం దీని నిర్వహణలో ఉంది:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nమీ నిర్వాహకుడు ఇమెయిల్లు, అనువర్తనాలు మరియు సురక్షిత వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలరు. మరింత సమాచారం కోసం, మీ నిర్వాహకుడిని సంప్రదించండి.\n\nఅలాగే, మీరు VPN కనెక్షన్ను సెటప్ చేయడానికి \"<xliff:g id="APPLICATION">%2$s</xliff:g>\"ని అనుమతించారు. కనుక ఈ అనువర్తనం కూడా నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలదు."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ఈ పరికరం దీని నిర్వహణలో ఉంది:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nమీ నిర్వాహకుడు ఇమెయిల్లు, అనువర్తనాలు మరియు సురక్షిత వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలరు. మరింత సమాచారం కోసం, మీ నిర్వాహకుడిని సంప్రదించండి.\n\nఅలాగే, మీరు VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\")కి కనెక్ట్ చేయబడ్డారు. కనుక మీ VPN సేవా ప్రదాత కూడా నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలరు."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index 252f6e4..61d8cef 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"ล้างข้อมูล"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ลบจากรายการ"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ข้อมูลแอปพลิเคชัน"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"ไม่มีแอปพลิเคชันล่าสุด"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ปิดแอปพลิเคชันล่าสุด"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 แอปพลิเคชันล่าสุด"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"กลับ"</string>
<string name="accessibility_home" msgid="8217216074895377641">"หน้าแรก"</string>
<string name="accessibility_menu" msgid="316839303324695949">"เมนู"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"แอปพลิเคชันล่าสุด"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"ค้นหา"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"กล้องถ่ายรูป"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"โทรศัพท์"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"ปิดการแจ้งเตือนแล้ว"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"หน้าต่างแจ้งเตือน"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"การตั้งค่าด่วน"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"แอปพลิเคชันล่าสุด"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"การตั้งค่า"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ผู้ใช้ <xliff:g id="USER">%s</xliff:g>"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g> <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"มือถือ <xliff:g id="SIGNAL">%1$s</xliff:g> <xliff:g id="TYPE">%2$s</xliff:g> <xliff:g id="NETWORK">%3$s</xliff:g>"</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"ปิดแผงควบคุม"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"เวลามากขึ้น"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"เวลาน้อยลง"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"ข้อมูล 2G-3G ปิดอยู่"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"ข้อมูล 4G ปิดอยู่"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"ข้อมูลมือถือปิดอยู่"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"ใช้ไปแล้ว <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ขีดจำกัด <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"คำเตือน <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"ไม่มีแอปล่าสุด"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ข้อมูลแอปพลิเคชัน"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"การล็อกแอป"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ค้นหา"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"คุณจะไม่ได้ยินเสียงปลุกในเวลา <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"การแจ้งเตือนที่เร่งด่วนน้อยด้านล่าง"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"แตะอีกครั้งเพื่อเปิด"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"กวาดขึ้นเพื่อปลดล็อก"</string>
<string name="phone_hint" msgid="3101468054914424646">"กวาดไปทางขวาเพื่อใช้โทรศัพท์"</string>
<string name="camera_hint" msgid="5241441720959174226">"กวาดไปทางซ้ายเพื่อใช้กล้องถ่ายรูป"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"สำคัญ"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"ทั้งหมด"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"กำลังชาร์จ (อีก <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> เต็ม)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"เพิ่มผู้ใช้"</string>
<string name="user_new_user_name" msgid="426540612051178753">"ผู้ใช้ใหม่"</string>
<string name="guest_nickname" msgid="8059989128963789678">"ผู้เข้าร่วม"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ ผู้เข้าร่วม"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"ออกจากโหมดผู้เยี่ยมชม"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"นำผู้เข้าร่วมออก"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"ต้องการออกจากเซสชันผู้เยี่ยมชมไหม"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"การออกจากเซสชันผู้เยี่ยมชมจะนำข้อมูลในเครื่องออก"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"ยินดีต้อนรับท่านผู้เยี่ยมชมกลับมาอีกครั้ง!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"คุณต้องการเริ่มเซสชันใหม่ไหม"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ใช่"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"ไม่เป็นไร ขอบคุณ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 นาที"</item>
<item quantity="other" msgid="6924190729213550991">"%d นาที"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"คุณเชื่อมต่อกับ VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") อยู่\n\nผู้ให้บริการ VPN สามารถตรวจสอบอุปกรณ์และกิจกรรมเครือข่าย รวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัยได้"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"อุปกรณ์นี้ได้รับการจัดการโดย:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nผู้ดูแลระบบของคุณสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณได้ รวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัย สำหรับข้อมูลเพิ่มเติม โปรดติดต่อผู้ดูแลระบบของคุณ\n\nนอกจากนี้ คุณได้ให้สิทธิ์ \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" เพื่อตั้งค่าการเชื่อมต่อ VPN แอปนี้สามารถตรวจสอบกิจกรรมในเครือข่ายได้เช่นกัน"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"อุปกรณ์นี้ได้รับการจัดการโดย:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nผู้ดูแลระบบของคุณสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณได้ รวมถึงอีเมล แอป และเว็บไซต์ที่ปลอดภัย สำหรับข้อมูลเพิ่มเติม โปรดติดต่อผู้ดูแลระบบของคุณ\n\nนอกจากนี้ คุณเชื่อมต่อกับ VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") ผู้ให้บริการ VPN ของคุณสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณได้เช่นกัน"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 6cf0070..96dfdd7 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"I-clear"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Alisin mula sa listahan"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Impormasyon ng app"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Walang kamakailang apps"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Huwag pansinin ang kamakailang apps"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 kamakailang app"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Bumalik"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Kamakailang apps"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Hanapin"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telepono"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Na-dismiss ang notification."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Notification shade."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Mga mabilisang setting."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Kamakailang apps."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Mga Setting"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"User na si <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobile <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Isara ang panel"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Higit pang oras"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Mas kaunting oras"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Naka-off ang 2G-3G data"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Naka-off ang 4G data"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Naka-off ang cellular data"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ang nagamit"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ang limitasyon"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Babala sa <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Walang kamakailang mga app"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Impormasyon ng Application"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"lock to app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"maghanap"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Hindi mo maririnig ang alarma mo ng <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Nasa ibaba ang mga notification na hindi masyadong mahalaga"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"I-tap ulit upang buksan"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Mag-swipe pataas upang i-unlock"</string>
<string name="phone_hint" msgid="3101468054914424646">"Mag-swipe pakanan para sa telepono"</string>
<string name="camera_hint" msgid="5241441720959174226">"Mag-swipe pakaliwa para sa camera"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Prayoridad"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Lahat"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Nagtsa-charge (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hanggang mapuno)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Magdagdag ng user"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Bagong user"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Bisita"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Bisita"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Lumabas bilang guest"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Alisin ang bisita"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Lalabas sa session ng bisita?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Maaalis ng paglabas sa session ng bisita ang lokal na data."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Maligayang pagbabalik, bisita!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Gusto mo bang magsimula ng bagong session?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Oo"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Hindi, salamat na lang"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Sa loob ng isang minuto"</item>
<item quantity="other" msgid="6924190729213550991">"Sa loob ng %d (na) minuto"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Nakakonekta ka sa isang VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nMaaaring subaybayan ng iyong VPN service provider ang iyong device at aktibidad sa network kabilang ang mga email, app at secure na website."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Ang device ay pinapamahalaan ng:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nMay kakayahan ang iyong administrator na subaybayan ang iyong aktibidad sa network kabilang ang mga email, apps at secure na website. Para sa higit pang impormasyon, makipag-ugnayan sa iyong administrator.\n\nGayundin, pinahintulutan mo ang \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" na mag-set up ng koneksyon sa VPN. Maaari ding subaybayan ng app na ito ang aktibidad sa network."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Ang device ay pinapamahalaan ng:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nMay kakayahan ang iyong administrator na subaybayan ang iyong aktibidad sa network kabilang ang mga email, apps at secure na website. Para sa higit pang impormasyon, makipag-ugnayan sa iyong administrator.\n\nGayundin, nakakonekta ka sa isang VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Maaari ding subaybayan ng iyong VPN service provider ang mga aktibidad sa network."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 7d0f49b..de21586 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Temizle"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Listeden kaldır"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Uygulama bilgileri"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Son uygulama yok"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Son uygulamaları kapat"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 tane son uygulama"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Geri"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Ana sayfa"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menü"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Son uygulamalar"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Ara"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Bildirim kapatıldı."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Bildirim gölgesi."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Hızlı ayarlar."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Son uygulamalar."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ayarlar"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Kullanıcı: <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobil <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Paneli kapatın"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Daha uzun süre"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Daha kısa süre"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G veri kullanımı kapalı"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G veri kullanımı kapalı"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Hücresel veri kapalı"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> kullanıldı"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Sınır: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> uyarısı"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Yakın zamanda kullanılan uygulama yok"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Uygulama Bilgileri"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"uygulamaya kilitle"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ara"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"<xliff:g id="ALARM_TIME">%s</xliff:g> olarak ayarlanan alarmı duymayacaksınız"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Daha az acil bildirimler aşağıdadır"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Açmak için tekrar hafifçe vurun"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Kilidi açmak için hızlıca yukarı kaydırın"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefon için sağa kaydırın"</string>
<string name="camera_hint" msgid="5241441720959174226">"Kamera için sola kaydırın"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Öncelik"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tümü"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Şarj oluyor (tamamen dolmasına <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> kaldı)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Kullanıcı ekle"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Yeni kullanıcı"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Misafir"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Misafir"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Misafir oturumundan çık"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Misafir oturumunu kaldır"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Misafir oturumundan çıkılsın mı?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Misafir oturumundan çıkmak tüm yerel verileri kaldıracaktır."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Tekrar hoş geldiniz sayın misafir!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Yeni bir oturum başlatmak istiyor musunuz?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Evet"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Hayır, teşekkürler"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Bir dakika süreyle"</item>
<item quantity="other" msgid="6924190729213550991">"%d dakika süreyle"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Bir VPN\'ye (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") bağlısınız.\n\nVPN servis sağlayıcınız e-postalar, uygulamalar ve güvenli web siteleri dahil olmak üzere ağ etkinliğinizi izleyebilir."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Bu cihazı yöneten kuruluş:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYöneticiniz e-postalar, uygulamalar ve güvenli web siteleri dahil olmak üzere ağ etkinliğinizi izleyebilir.\n\nAyrıca \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" uygulamasına VPN bağlantısı kurma izni de verdiniz. Bu uygulama da ağ etkinliğini izleyebilir."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Bu cihazı yöneten kuruluş:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n.Yöneticiniz e-postalar, uygulamalar ve güvenli web siteleri dahil olmak üzere ağ etkinliğinizi izleyebilir. Daha fazla bilgi için yöneticinizle iletişim kurun.\n\n Ayrıca bir VPN\'ye de (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") bağlısınız. VPN servis sağlayıcınız da ağ etkinliğini izleyebilir."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 57c601b..8cf85bd 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Очист."</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Видалити зі списку"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Інформація про програму"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Немає останніх програм"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Відхилити останні програми"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 остання програма"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Назад"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Головна"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Меню"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Останні програми"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Пошук"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Номер телефону"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Сповіщення відхилено."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Панель сповіщень."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Швидке налаштування."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Нещодавні програми."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Налаштування"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Користувач <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мобільне передавання даних: <xliff:g id="SIGNAL">%1$s</xliff:g>, <xliff:g id="TYPE">%2$s</xliff:g>, <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Закрити панель"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Більше часу"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Менше часу"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Дані 2G–3G вимкнено"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Дані 4G вимкнено"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Мобільні дані вимкнено"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Використовується: <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Обмеження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Застереження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Немає останніх додатків"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Інформація про додаток"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"блокування в додатку"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Сигнал не лунатиме о <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Менше термінових сповіщень нижче"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Торкніться знову, щоб відкрити"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Проведіть пальцем угору, щоб розблокувати"</string>
<string name="phone_hint" msgid="3101468054914424646">"Проведіть пальцем праворуч, щоб скористатися телефоном"</string>
<string name="camera_hint" msgid="5241441720959174226">"Проведіть пальцем ліворуч, щоб скористатися камерою"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Пріоритетні"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Усі"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Заряджання (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> до повного зарядження)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Додати користувача"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Новий користувач"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Гість"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"Додати гостя"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Вийти з режиму гостя"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Видалити гостя"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Закінчити сеанс у режимі \"Гість\"?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Якщо закінчити сеанс у режимі \"Гість\", локальні дані буде видалено."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"З поверненням!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Почати новий сеанс?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Так"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Ні, дякую"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Протягом хвилини"</item>
<item quantity="other" msgid="6924190729213550991">"Протягом %d хв"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Ви під’єднані до мережі VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nПостачальник послуг VPN може відстежувати пристрій та дії в мережі, зокрема листування, роботу в додатках і на захищених веб-сайтах."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Цим пристроєм керує \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдміністратор може відстежувати ваші дії в мережі, зокрема листування, роботу в додатках і на захищених веб-сайтах. Щоб дізнатися більше, зверніться до адміністратора.\n\nВи також дозволили додатку <xliff:g id="APPLICATION">%2$s</xliff:g> під’єднатися до мережі VPN. Цей додаток теж може відстежувати ваші дії в мережі."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Цим пристроєм керує \n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nАдміністратор може відстежувати ваші дії в мережі, зокрема листування, роботу в додатках і на захищених веб-сайтах. Щоб дізнатися більше, зверніться до адміністратора.\n\nВаш пристрій також під’єднаний до мережі VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Постачальник послуг VPN може відстежувати ваші дії в мережі."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml
index 36f6f6f..cb92e83 100644
--- a/packages/SystemUI/res/values-ur-rPK/strings.xml
+++ b/packages/SystemUI/res/values-ur-rPK/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"صاف کریں"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"فہرست سے ہٹائیں"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ایپ کی معلومات"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"کوئی حالیہ ایپس نہیں ہیں"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"حالیہ ایپس برخاست کریں"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 حالیہ ایپ"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"واپس جائیں"</string>
<string name="accessibility_home" msgid="8217216074895377641">"ہوم"</string>
<string name="accessibility_menu" msgid="316839303324695949">"مینو"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"حالیہ ایپس"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"تلاش کریں"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"کیمرا"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"فون"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"اطلاع مسترد ہوگئی۔"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"اطلاعاتی شیڈ۔"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"فوری ترتیبات۔"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"حالیہ ایپس۔"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"ترتیبات"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"صارف <xliff:g id="USER">%s</xliff:g>۔"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>۔ <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"موبائل <xliff:g id="SIGNAL">%1$s</xliff:g>۔ <xliff:g id="TYPE">%2$s</xliff:g>۔ <xliff:g id="NETWORK">%3$s</xliff:g>۔"</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"پینل بند کریں"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"مزید وقت"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"کم وقت"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G ڈیٹا آف ہے"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G ڈیٹا آف ہے"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"سیلولر ڈیٹا آف ہے"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> استعمال کردہ"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> حد"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> وارننگ"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"کوئی حالیہ ایپس نہیں ہیں"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"ایپلیکیشن کی معلومات"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"لاک ٹو ایپ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"تلاش کریں"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"آپ کو <xliff:g id="ALARM_TIME">%s</xliff:g> بجے اپنا الارم سنائی نہیں دیگا"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"کم اہم اطلاعات ذیل میں ہیں"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"کھولنے کیلئے دوبارہ تھپتھپائیں"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"غیر مقفل کرنے کیلئے اوپر سوائپ کریں"</string>
<string name="phone_hint" msgid="3101468054914424646">"فون کیلئے دائیں سوائپ کریں"</string>
<string name="camera_hint" msgid="5241441720959174226">"کیمرہ کیلئے بائیں سوائپ کریں"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"ترجیح"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"سبھی"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"چارج ہو رہا ہے (مکمل ہونے تک <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> باقی ہیں)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"صارف کو شامل کریں"</string>
<string name="user_new_user_name" msgid="426540612051178753">"نیا صارف"</string>
<string name="guest_nickname" msgid="8059989128963789678">"مہمان"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ مہمان"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"مہمان وضع سے باہر نکلیں"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"مہمان کو ہٹائیں"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"مہمان سیشن سے باہر نکل رہے ہیں؟"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"مہمان سیشن سے باہر نکلنے سے مقامی ڈیٹا ہٹ جائے گا۔"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"مہمان، پھر سے خوش آمدید!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"کیا آپ ایک نیا سیشن شروع کرنا چاہتے ہیں؟"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"ہاں"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"نہیں، شکریہ"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"ایک منٹ کیلئے"</item>
<item quantity="other" msgid="6924190729213550991">"%d منٹ کیلئے"</item>
@@ -303,8 +319,10 @@
<string name="open_app" msgid="4011771120339160755">"ایپ کھولیں"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"VPN کو غیر منسلک کریں"</string>
<string name="monitoring_description_device_owned" msgid="7512371572956715493">"اس آلہ کا نظم مندرجہ ذیل کے ذریعے کیا جاتا ہے:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nآپ کا منتظم آپ کے آلہ اور نیٹ ورک کی سرگرمی، بشمول ای میلز، ایپس اور محفوظ ویب سائٹس کو مانیٹر کر سکتا ہے۔\n\nمزید معلومات کیلئے، اپنے منتظم سے رابطہ کریں۔"</string>
- <string name="monitoring_description_vpn" msgid="7288268682714305659">"آپ نے \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" کو ایک VPN کنکشن سیٹ اپ کرنے کی اجازت دی ہے۔\n\nیہ ایپ ای میلز، ایپس اور محفوظ ویب سائٹس کے بشمول آپ کے آلہ اور نیٹ ورک کی سرگرمی کو مانیٹر کر سکتا ہے۔"</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"آپ نے \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" کو ایک VPN کنکشن سیٹ اپ کرنے کی اجازت دی ہے۔\n\nیہ ایپ ای میلز، ایپس اور محفوظ ویب سائٹس کے بشمول آپ کے آلہ اور نیٹ ورک کی سرگرمی کو مانیٹر کر سکتی ہے۔"</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"آپ ایک VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\") سے منسلک ہیں۔\n\nآپ کا VPN سروس فراہم کنندہ ای میلز، ایپس اور محفوظ ویب سائٹس کے بشمول آپ کے آلہ اور نیٹ ورک کی سرگرمی کو مانیٹر کر سکتا ہے۔"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"اس آلہ کا نظم مندرجہ ذیل کے ذریعے کیا جاتا ہے:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nآپ کا منتظم آپ کے نیٹ ورک کی سرگرمی بشمول ای میلز، ایپس اور محفوظ ویب سائٹس کو مانیٹر کرنے کا اہل ہے۔ مزید معلومات کیلئے، اپنے منتظم سے رابطہ کریں۔\n\nنیز، آپ نے \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" کو ایک VPN کنکشن ترتیب دینے کی اجازت دی ہے۔ یہ ایپ نیٹ ورک کی سرگرمی بھی مانیٹر کر سکتی ہے۔"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"اس آلہ کا نظم مندرجہ ذیل کے ذریعے کیا جاتا ہے:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nآپ کا منتظم آپ کے نیٹ ورک کی سرگرمی بشمول ای میلز، ایپس اور محفوظ ویب سائٹس کو مانیٹر کرنے کا اہل ہے۔ مزید معلومات کیلئے، اپنے منتظم سے رابطہ کریں۔\n\nنیز، آپ ایک VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\") سے منسلک ہیں۔ آپ کی VPN سروس کا فراہم کنندہ نیٹورک کی سرگرمی کو بھی مانیٹر کر سکتا ہے۔"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml
index 094047d..369c6ee 100644
--- a/packages/SystemUI/res/values-uz-rUZ/strings.xml
+++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Tozalash"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Ro‘yxatdan o‘chirish"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Ilova xaqida"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Yaqinda foydalanilgan ilova dasturlar mavjud emas"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"So‘nggi dasturlarni tozalash"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ta so‘nggi foydalanilgan dastur"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Orqaga"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Uyga"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menyu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"So‘nggi foydalanilgan ilovalar"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Izlash"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Kamera"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Xabarnoma e‘tiborsiz qoldirildi."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Xabarnoma soyasi."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Tezkor sozlamalar."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Yaqinda ishlatilgan ilovalar."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Sozlamalar"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Foydalanuvchi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Uyali <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Panelni yopish"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Vaqtni ko‘paytirish"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Vaqtni kamaytirish"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G/3G internet o‘chirib qo‘yildi"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G internet o‘chirib qo‘yildi"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Mobil internet o‘chirib qo‘yildi"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> foydalanilgan"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> chegarasi"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ogohlantirish: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"So‘nggi foydalanilgan ilovalar yo‘q"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Ilova haqida ma’lumot"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"ilovaga qulflash"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"qidirish"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Keyingi uyg‘otkich: <xliff:g id="ALARM_TIME">%s</xliff:g>. Ovoz eshitilmaydi."</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Kam ahamiyatli bildirishnomalarni pastda ko‘rsatish"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Ochish uchun yana bosing"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Qulfdan chiqarish uchun yuqoriga suring"</string>
<string name="phone_hint" msgid="3101468054914424646">"Telefonni ochish uchun o‘ngga"</string>
<string name="camera_hint" msgid="5241441720959174226">"Kamerani ochish uchun chapga suring"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Ustuvorlik"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Barchasi"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Quvvat olmoqda (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>da to‘ladi)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Foydalanuvchi qo‘shish"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Yangi foydalanuvchi"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Mehmon"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Mehmon"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Mehmon rejimidan chiqish"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Mehmon rejimini o‘chirish"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Mehmon rejimidan chiqilsinmi?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Qurilmadagi mehmon rejimida saqlangan ma’lumotlar o‘chib ketadi."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Xush kelibsiz, mehmon!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Yangi seans boshlamoqchimisiz?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Ha"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Yo‘q, kerak emas"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 daqiqa"</item>
<item quantity="other" msgid="6924190729213550991">"%d daqiqa"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Qurilma VPN tarmog‘iga ulangan (“<xliff:g id="APPLICATION">%1$s</xliff:g>”).\n\nXatti-harakatlaringiz VPN xizmati ta’minotchisiga ham ko‘rinadi."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Bu qurilma boshqaruvchisi:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdmin-ngiz tarmoqdagi faollik – e-pochta, ilova va xavfsiz veb-saytlardagi harakat-ni kuzatishi m-n. Qo‘shimcha ma’lumot olish u-n admin-ga murojaat qiling.\n\nSiz “<xliff:g id="APPLICATION">%2$s</xliff:g>” ilovasiga VPN ulanishini sozlash u-n ruxsat berdingiz. U ham tarmoqdagi faolligingizni kuzatishi mumkin."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Bu qurilma boshqaruvchisi:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nAdmin-ngiz tarmoqdagi faollik – e-pochta, ilova va xavfsiz veb-saytlardagi harakat-ni kuzatishi m-n. Qo‘shimcha ma’lumot olish u-n admin-ga murojaat qiling.\n\nSiz VPN tarmog‘iga ham ulangansiz (“<xliff:g id="APPLICATION">%2$s</xliff:g>”). VPN xizmati ta’minotchingiz ham tarmoqdagi faollingizni kuzatishi m-n."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 1be355c..acbcbaa 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Xóa"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Xóa khỏi danh sách"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Thông tin về ứng dụng"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Không có ứng dụng nào gần đây"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Loại bỏ các ứng dụng gần đây"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 ứng dụng gần đây"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Quay lại"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Trang chủ"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Ứng dụng gần đây"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Tìm kiếm"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Máy ảnh"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Điện thoại"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Đã loại bỏ thông báo."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Bóng thông báo."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Cài đặt nhanh."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Ứng dụng gần đây."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Cài đặt"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Người dùng <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Di động <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Đóng bảng điều khiển"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Nhiều thời gian hơn"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Ít thời gian hơn"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Dữ liệu 2G-3G bị tắt"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Dữ liệu 4G bị tắt"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Dữ liệu di động bị tắt"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Đã sử dụng <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Giới hạn <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Cảnh báo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Không có ứng dụng nào gần đây"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Thông tin ứng dụng"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"khóa trong ứng dụng"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tìm kiếm"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Bạn sẽ không nghe thấy báo thức lúc <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Thông báo ít khẩn cấp hơn bên dưới"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Nhấn lại để mở"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Vuốt lên để mở khóa"</string>
<string name="phone_hint" msgid="3101468054914424646">"Vuốt sang phải để mở điện thoại"</string>
<string name="camera_hint" msgid="5241441720959174226">"Vuốt sang trái để mở máy ảnh"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Ưu tiên"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Tất cả"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Đang sạc (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> cho đến khi đầy)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Thêm người dùng"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Người dùng mới"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Khách"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Khách"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Thoát chế độ khách"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Xóa phiên khách"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Bạn có muốn thoát khỏi phiên khách không?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Thoát khỏi phiên khách sẽ xóa dữ liệu cục bộ."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Chào mừng bạn trở lại!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Bạn có muốn bắt đầu phiên mới không?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Có"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Không, xin cảm ơn"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Trong một phút"</item>
<item quantity="other" msgid="6924190729213550991">"Trong %d phút"</item>
@@ -306,5 +322,7 @@
<string name="monitoring_description_vpn" msgid="7288268682714305659">"Bạn đã cấp cho \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" quyền thiết lập kết nối VPN.\n\nỨng dụng này có thể giám sát hoạt động mạng và thiết bị của bạn, bao gồm email, ứng dụng và các trang web an toàn."</string>
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Bạn đang kết nối với VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nNhà cung cấp dịch vụ VPN có thể giám sát hoạt động mạng và thiết bị của bạn bao gồm email, ứng dụng và các trang web an toàn."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Thiết bị này được quản lý bởi:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nQuản trị viên có thể giám sát hoạt động mạng gồm email, ứng dụng và trang web an toàn. Để biết thêm thông tin, hãy liên hệ với quản trị viên.\n\nNgoài ra, bạn đã cấp cho \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" quyền thiết lập kết nối VPN. Ứng dụng này có thể giám sát hoạt động mạng."</string>
- <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Thiết bị này được quản lý bởi:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nQuản trị viên có thể giám sát hoạt động mạng của bạn bao gồm email, ứng dụng và các trang web an toàn. Để biết thêm thông tin, hãy liên hệ với quản trị viên của bạn.\n\nNgoài ra, bạn đang kết nối với VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Nhà cung cấp dịch vụ VPN cũng có thể giám sát hoạt động mạng."</string>
+ <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Thiết bị này được quản lý bởi:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nQuản trị viên có thể giám sát hoạt động mạng của bạn bao gồm email, ứng dụng và các trang web an toàn. Để biết thêm thông tin, hãy liên hệ với quản trị viên của bạn.\n\nNgoài ra, bạn được kết nối với VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Nhà cung cấp dịch vụ VPN cũng có thể giám sát hoạt động mạng."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index cd23c9c..c09209c 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"清除"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"从列表中删除"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"应用信息"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"最近没有运行任何应用"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"关闭最近运行的应用"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 个最近运行的应用"</item>
@@ -39,9 +40,9 @@
<string name="invalid_charger_title" msgid="3515740382572798460">"不支持USB充电。"</string>
<string name="invalid_charger_text" msgid="5474997287953892710">"仅限使用设备随附的充电器。"</string>
<string name="battery_low_why" msgid="4553600287639198111">"设置"</string>
- <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"要打开节电助手吗？"</string>
- <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"打开"</string>
- <string name="battery_saver_start_action" msgid="5576697451677486320">"打开节电助手"</string>
+ <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"要开启节电助手吗？"</string>
+ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"开启"</string>
+ <string name="battery_saver_start_action" msgid="5576697451677486320">"开启节电助手"</string>
<string name="status_bar_settings_settings_button" msgid="3023889916699270224">"设置"</string>
<string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"WLAN"</string>
<string name="status_bar_settings_airplane" msgid="4879879698500955300">"飞行模式"</string>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"返回"</string>
<string name="accessibility_home" msgid="8217216074895377641">"主屏幕"</string>
<string name="accessibility_menu" msgid="316839303324695949">"菜单"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"最近运行的应用"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"搜索"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"相机"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"电话"</string>
@@ -157,7 +159,10 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"已关闭通知。"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"通知栏。"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"快捷设置。"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"最近使用的应用。"</string>
+ <!-- no translation found for accessibility_desc_settings (3417884241751434521) -->
+ <skip />
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"用户：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>，<xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"移动数据连接：<xliff:g id="SIGNAL">%1$s</xliff:g>，<xliff:g id="TYPE">%2$s</xliff:g>，<xliff:g id="NETWORK">%3$s</xliff:g>。"</string>
@@ -169,6 +174,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"关闭面板"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"更长时间"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"更短时间"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G数据网络已关闭"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G数据网络已关闭"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"移动数据网络已关闭"</string>
@@ -181,8 +188,7 @@
<string name="gps_notification_found_text" msgid="4619274244146446464">"已通过GPS确定位置"</string>
<string name="accessibility_location_active" msgid="2427290146138169014">"应用发出了有效位置信息请求"</string>
<string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string>
- <!-- no translation found for status_bar_notification_inspect_item_title (5386295743469882227) -->
- <skip />
+ <string name="status_bar_notification_inspect_item_title" msgid="5386295743469882227">"设置"</string>
<string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"屏幕会自动旋转。"</string>
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"屏幕锁定为横向模式。"</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"屏幕锁定为纵向模式。"</string>
@@ -241,7 +247,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"已使用<xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限为<xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g>警告"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"最近没有用过任何应用"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"应用信息"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"开启单应用模式"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string>
@@ -261,7 +268,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"您在<xliff:g id="ALARM_TIME">%s</xliff:g>将不会听到闹钟响铃"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"不太紧急的通知会显示在下方"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"再次点按即可打开"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"向上滑动即可解锁"</string>
<string name="phone_hint" msgid="3101468054914424646">"向右滑动可打开拨号界面"</string>
<string name="camera_hint" msgid="5241441720959174226">"向左滑动可打开相机"</string>
@@ -270,19 +278,26 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"优先"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"全部"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"正在充电（还需<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>充满）"</string>
- <!-- no translation found for user_add_user (5110251524486079492) -->
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
<skip />
- <!-- no translation found for user_new_user_name (426540612051178753) -->
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
<skip />
+ <string name="user_add_user" msgid="5110251524486079492">"添加用户"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"新用户"</string>
<string name="guest_nickname" msgid="8059989128963789678">"访客"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"添加新访客"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"退出访客模式"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <!-- no translation found for guest_exit_guest (7187359342030096885) -->
+ <skip />
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"要退出访客模式吗？"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"退出访客模式将移除本地数据。"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"访客，欢迎回来！"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"要发起新的会话吗？"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"是"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"不"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1分钟"</item>
<item quantity="other" msgid="6924190729213550991">"%d分钟"</item>
@@ -292,7 +307,7 @@
<item quantity="other" msgid="5408537517529822157">"%d小时"</item>
</plurals>
<string name="battery_saver_notification_title" msgid="237918726750955859">"节电助手已开启"</string>
- <string name="battery_saver_notification_text" msgid="820318788126672692">"降低性能并减少后台数据"</string>
+ <string name="battery_saver_notification_text" msgid="820318788126672692">"降低性能并限制后台流量"</string>
<string name="battery_saver_notification_action_text" msgid="109158658238110382">"关闭节电助手"</string>
<string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g>%%"</string>
<string name="notification_hidden_text" msgid="1135169301897151909">"内容已隐藏"</string>
@@ -307,12 +322,11 @@
<string name="monitoring_title" msgid="169206259253048106">"网络监控"</string>
<string name="open_app" msgid="4011771120339160755">"打开应用"</string>
<string name="disconnect_vpn" msgid="1324915059568548655">"断开VPN连接"</string>
- <!-- no translation found for monitoring_description_device_owned (7512371572956715493) -->
- <skip />
- <!-- no translation found for monitoring_description_vpn (7288268682714305659) -->
- <skip />
- <!-- no translation found for monitoring_description_legacy_vpn (4740349017929725435) -->
- <skip />
- <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"此设备由以下单位管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。若要了解详情，请与您的管理员联系。\n\n此外，您已授权“<xliff:g id="APPLICATION">%2$s</xliff:g>”可以设置VPN连接。此应用也可以监控网络活动。"</string>
+ <string name="monitoring_description_device_owned" msgid="7512371572956715493">"此设备由以下单位管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n您的管理员可以监控您的设备和网络活动，包括收发电子邮件、使用应用和浏览安全网站。\n\n若要了解详情，请与您的管理员联系。"</string>
+ <string name="monitoring_description_vpn" msgid="7288268682714305659">"您已授权“<xliff:g id="APPLICATION">%1$s</xliff:g>”设置VPN连接。\n\n此应用可以监控您的设备和网络活动，包括收发电子邮件、使用应用和浏览安全网站。"</string>
+ <string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"您已连接到VPN（“<xliff:g id="APPLICATION">%1$s</xliff:g>”）。\n\n您的VPN服务提供商可以监控您的设备和网络活动，包括收发电子邮件、使用应用和浏览安全网站。"</string>
+ <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"此设备由以下单位管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。若要了解详情，请与您的管理员联系。\n\n此外，您已授权“<xliff:g id="APPLICATION">%2$s</xliff:g>”设置VPN连接。此应用也可以监控网络活动。"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"此设备由以下单位管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\n您的管理员可以监控您的网络活动，包括收发电子邮件、使用应用和浏览安全网站。若要了解详情，请与您的管理员联系。\n\n此外，您已连接到VPN（“<xliff:g id="APPLICATION">%2$s</xliff:g>”）。您的VPN服务提供商也可以监控您的网络活动。"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 44076be..26b6aa0 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"清除"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"從清單中移除"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"應用程式資訊"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"沒有最近的應用程式"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"關閉最近使用的應用程式"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 個最近使用的應用程式"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"返回"</string>
<string name="accessibility_home" msgid="8217216074895377641">"首頁"</string>
<string name="accessibility_menu" msgid="316839303324695949">"選單"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"最近使用的應用程式"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"搜尋"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"相機"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"電話"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"通知已關閉。"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"通知欄。"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"快速設定。"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"最近使用的應用程式"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"用戶：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>、<xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"流動數據連線：<xliff:g id="SIGNAL">%1$s</xliff:g>、<xliff:g id="TYPE">%2$s</xliff:g>、<xliff:g id="NETWORK">%3$s</xliff:g>。"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"關閉面板"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"更多時間"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"較少時間"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G 數據連線已關閉"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G 數據連線已關閉"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"流動數據連線已關閉"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"已使用 <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"沒有最近使用的應用程式"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資料"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"應用程式鎖定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"您不會聽到<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"還有 <xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g> 則通知"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"不太緊急的通知會在下方顯示"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"再次輕按即可開啟"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"向上快速滑動即可解鎖"</string>
<string name="phone_hint" msgid="3101468054914424646">"向右快速滑動即可使用手機功能"</string>
<string name="camera_hint" msgid="5241441720959174226">"向左快速滑動即可使用相機功能"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"優先順序"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"全部"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"充電中 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後完成充電)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"新增使用者"</string>
<string name="user_new_user_name" msgid="426540612051178753">"新使用者"</string>
<string name="guest_nickname" msgid="8059989128963789678">"訪客"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"新增訪客"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"結束訪客模式"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"移除訪客"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"要結束訪客工作階段嗎？"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"結束訪客工作階段後，本機資料將被移除。"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"訪客您好，歡迎回來！"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"您要開始新的工作階段嗎？"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"是"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"不用了，謝謝"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 分鐘"</item>
<item quantity="other" msgid="6924190729213550991">"%d 分鐘"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"您已連線至 VPN (「<xliff:g id="APPLICATION">%1$s</xliff:g>」)。\n\n您的 VPN 服務供應商可以監控您的裝置和網絡活動，包括收發電郵、使用應用程式和瀏覽安全網站。"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"這部裝置由下列網域管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>。\n\n您的管理員可以監控您的網絡活動，包括收發電郵、使用應用程式和瀏覽安全網站。如需更多資料，請與您的管理員聯絡。\n\n同時，由於您已授權「<xliff:g id="APPLICATION">%2$s</xliff:g>」設定 VPN 連線，因此這個應用程式也能監控您的網絡活動。"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"這部裝置由下列網域管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>。\n\n您的管理員可以監控您的網絡活動，包括收發電郵、使用應用程式和瀏覽安全網站。如需更多資料，請與您的管理員聯絡。\n\n同時，您的裝置已連線至 VPN (「<xliff:g id="APPLICATION">%2$s</xliff:g>」)，因此您的 VPN 服務供應商也能監控您的網絡活動。"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 90b22c8..4a82dc7 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"清除"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"從清單中移除"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"應用程式資訊"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"沒有最近使用的應用程式"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"關閉最近使用的應用程式"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"1 個最近使用的應用程式"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"返回"</string>
<string name="accessibility_home" msgid="8217216074895377641">"主螢幕"</string>
<string name="accessibility_menu" msgid="316839303324695949">"選單"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"最近使用的應用程式"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"搜尋"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"相機"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"電話"</string>
@@ -157,7 +159,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"已關閉通知。"</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"通知欄。"</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"快速設定。"</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"最近使用的應用程式。"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"使用者：<xliff:g id="USER">%s</xliff:g>。"</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>，<xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"行動數據連線：<xliff:g id="SIGNAL">%1$s</xliff:g>，<xliff:g id="TYPE">%2$s</xliff:g>，<xliff:g id="NETWORK">%3$s</xliff:g>。"</string>
@@ -169,6 +173,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"關閉面板"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"更多時間"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"更少時間"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"2G-3G 數據連線已關閉"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"4G 數據連線已關閉"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"行動數據連線已關閉"</string>
@@ -240,7 +246,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"已使用 <xliff:g id="DATA_USED">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"沒有最近使用的應用程式"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資訊"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"應用程式鎖定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
@@ -260,7 +267,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"您不會聽到<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"還有 <xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g> 則通知"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"較不緊急的通知會顯示在下方"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"再次輕按即可開啟"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"向上滑動即可解鎖"</string>
<string name="phone_hint" msgid="3101468054914424646">"向左滑動可使用手機功能"</string>
<string name="camera_hint" msgid="5241441720959174226">"向左滑動可使用相機功能"</string>
@@ -269,17 +277,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"優先"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"全部"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"充電中 (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>後充飽)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"新增使用者"</string>
<string name="user_new_user_name" msgid="426540612051178753">"新使用者"</string>
<string name="guest_nickname" msgid="8059989128963789678">"訪客"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"新增訪客"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"結束訪客模式"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"移除訪客"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"結束訪客工作階段？"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"訪客工作階段結束後，本機資料將遭到刪除。"</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"訪客您好，歡迎回來！"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"您要啟動新的工作階段嗎？"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"是"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"不用了，謝謝"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"1 分鐘"</item>
<item quantity="other" msgid="6924190729213550991">"%d 分鐘"</item>
@@ -309,4 +325,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"您已連線至 VPN (「<xliff:g id="APPLICATION">%1$s</xliff:g>」)。\n\n您的 VPN 服務供應商可以監控您的裝置和網路活動，包括收發電子郵件、使用應用程式和瀏覽安全網站。"</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"這個裝置由下列網域管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>。\n\n您的管理員可以監控您的網路活動，包括收發電子郵件、使用應用程式和瀏覽安全網站。如需詳細資訊，請與您的管理員聯絡。\n\n同時，由於您已授權「<xliff:g id="APPLICATION">%2$s</xliff:g>」設定 VPN 連線，因此這個應用程式也能監控您的網路活動。"</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"這個裝置由下列網域管理：\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>。\n\n您的管理員可以監控您的網路活動，包括收發電子郵件、使用應用程式和瀏覽安全網站。如需詳細資訊，請與您的管理員聯絡。\n\n同時，由於您的裝置已連線至 VPN (「<xliff:g id="APPLICATION">%2$s</xliff:g>」)，因此您的 VPN 服務供應商也能監控您的網路活動。"</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index e986ce9..935ff63 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -23,7 +23,8 @@
<string name="status_bar_clear_all_button" msgid="7774721344716731603">"Sula"</string>
<string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Susa ohlwini"</string>
<string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Ulwazi lwensiza"</string>
- <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Azikho izinhlelo zokusebenza zakamuva"</string>
+ <!-- no translation found for status_bar_no_recent_apps (7374907845131203189) -->
+ <skip />
<string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Susa izinhlelo zokusebenza zakamumva"</string>
<plurals name="status_bar_accessibility_recent_apps">
<item quantity="one" msgid="5854176083865845541">"Insiza eyi-1 yakamumva"</item>
@@ -80,7 +81,8 @@
<string name="accessibility_back" msgid="567011538994429120">"Emuva"</string>
<string name="accessibility_home" msgid="8217216074895377641">"Ekhaya"</string>
<string name="accessibility_menu" msgid="316839303324695949">"Imenyu"</string>
- <string name="accessibility_recent" msgid="8571350598987952883">"Izinhlelo zokusebenza zakamuva"</string>
+ <!-- no translation found for accessibility_recent (1606470783629913980) -->
+ <skip />
<string name="accessibility_search_light" msgid="1103867596330271848">"Sesha"</string>
<string name="accessibility_camera_button" msgid="8064671582820358152">"Ikhamela"</string>
<string name="accessibility_phone_button" msgid="6738112589538563574">"Ifoni"</string>
@@ -155,7 +157,9 @@
<string name="accessibility_notification_dismissed" msgid="854211387186306927">"Isaziso sichithiwe."</string>
<string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Umthunzi wesaziso."</string>
<string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Izilingiselelo ezisheshayo."</string>
- <string name="accessibility_desc_recent_apps" msgid="9014032916410590027">"Izinhlelo zokusebenza zakamuva"</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Izilungiselelo"</string>
+ <!-- no translation found for accessibility_desc_recent_apps (8376953390514779637) -->
+ <skip />
<string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Umsebenzisi <xliff:g id="USER">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_wifi" msgid="6099781031669728709">"<xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="NETWORK">%2$s</xliff:g>"</string>
<string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Iselula <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string>
@@ -167,6 +171,8 @@
<string name="accessibility_quick_settings_close" msgid="2571790856136835943">"Vala iphaneli"</string>
<string name="accessibility_quick_settings_more_time" msgid="5778794273488176726">"Isikhathi esiningi"</string>
<string name="accessibility_quick_settings_less_time" msgid="101026945195230084">"Isikhathi esingaphansi"</string>
+ <!-- no translation found for accessibility_brightness (8003681285547803095) -->
+ <skip />
<string name="data_usage_disabled_dialog_3g_title" msgid="2626865386971800302">"Idatha ye-2G-3G ivaliwe"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4629078114195977196">"Idatha ye-4G ivaliwe"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="5793456071535876132">"Idatha yeselula ivaliwe"</string>
@@ -238,7 +244,8 @@
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> isetshenzisiwe"</string>
<string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> umkhawulo"</string>
<string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> isexwayiso"</string>
- <string name="recents_empty_message" msgid="7883614615463619450">"Azikho izinhlelo zokusebenza zakamuva"</string>
+ <!-- no translation found for recents_empty_message (8682129509540827999) -->
+ <skip />
<string name="recents_app_info_button_label" msgid="2890317189376000030">"Ulwazi lohlelo lokusebenza"</string>
<string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"ukukhiya kuhlelo lokusebenza"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sesha"</string>
@@ -258,7 +265,8 @@
<string name="zen_alarm_warning" msgid="6873910860111498041">"Ngeke uzwe i-alamu yakho ngo-<xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
<string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string>
<string name="speed_bump_explanation" msgid="1288875699658819755">"Izaziso ezingasheshi kakhulu ezingezansi"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Thepha futhi ukuze uvule"</string>
+ <!-- no translation found for notification_tap_again (8524949573675922138) -->
+ <skip />
<string name="keyguard_unlock" msgid="8043466894212841998">"Swayiphela phezulu ukuze uvule"</string>
<string name="phone_hint" msgid="3101468054914424646">"Swayiphela ngakwesokudla ukuze uthole ifoni"</string>
<string name="camera_hint" msgid="5241441720959174226">"Swayiphela ngakwesokunxele ukuze uthole ikhamela"</string>
@@ -267,17 +275,25 @@
<string name="interruption_level_priority" msgid="6517366750688942030">"Okubalulekile"</string>
<string name="interruption_level_all" msgid="1330581184930945764">"Konke"</string>
<string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Iyashaja (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ize igcwale)"</string>
+ <!-- no translation found for accessibility_multi_user_switch_switcher (7305948938141024937) -->
+ <skip />
+ <!-- no translation found for accessibility_multi_user_switch_quick_contact (3020367729287990475) -->
+ <skip />
<string name="user_add_user" msgid="5110251524486079492">"Engeza umsebenzisi"</string>
<string name="user_new_user_name" msgid="426540612051178753">"Umsebenzisi omusha"</string>
<string name="guest_nickname" msgid="8059989128963789678">"Isihambeli"</string>
- <string name="guest_new_guest" msgid="4259024453643879653">"+ Isihambeli"</string>
- <string name="guest_exit_guest" msgid="1619100760451149682">"Phuma kusivakashi"</string>
+ <!-- no translation found for guest_new_guest (600537543078847803) -->
+ <skip />
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Susa isivakashi"</string>
<string name="guest_exit_guest_dialog_title" msgid="7587460301980067285">"Phuma kusikhathi sesivakashi?"</string>
<string name="guest_exit_guest_dialog_message" msgid="10255285459589280">"Ukuphuma kusikhathi sesivakashi kuzosusa idatha yendawo."</string>
<string name="guest_wipe_session_title" msgid="6419439912885956132">"Siyakwamukela futhi, sivakashi!"</string>
- <string name="guest_wipe_session_message" msgid="5369763062345463297">"Ingabe ufuna ukuqala isikhathi esisha?"</string>
- <string name="guest_wipe_session_wipe" msgid="9154291314115781448">"Yebo"</string>
- <string name="guest_wipe_session_dontwipe" msgid="850084868661344050">"Cha, ngiyabonga"</string>
+ <!-- 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 />
<plurals name="zen_mode_duration_minutes">
<item quantity="one" msgid="9040808414992812341">"Iminithi elilodwa"</item>
<item quantity="other" msgid="6924190729213550991">"Amaminithi angu-%d"</item>
@@ -307,4 +323,6 @@
<string name="monitoring_description_legacy_vpn" msgid="4740349017929725435">"Uxhumekile ku-VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nUmhlinzeki wakho wesevisi ye-VPN angangamela idivayisi yakho nomsebenzi wenethiwekhi kufaka phakathi ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile."</string>
<string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Le divayisi iphethwe i-:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nUmqondisi wakho uyakwazi ukwengamela umsebenzi wakho wenethiwekhi kufaka phakathi ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile. Ngolwazi olubanzi, xhumana nomqondisi wakho.\n\nFuthi, unike i-\"<xliff:g id="APPLICATION">%2$s</xliff:g>\" imvume yokusetha uxhumo le-VPN. Lolu hlelo lokusebenza lungangamela futhi umsebenzi wenethiwekhi."</string>
<string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Le divayisi iphathwe i-:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nUmqondisi wakho uyakwazi ukwengamela umsebenzi wenethiwekhi yakho kufaka phakathi ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile. Ngolwazi olubanzi, xhumana nomqondisi wakho.\n\nFuthi, uxhumekile ku-VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Umhlinzeki wakho wesevisi ye-VPN angangamela futhi umsebenzi wenethiwekhi."</string>
+ <!-- no translation found for keyguard_indication_trust_disabled (7412534203633528135) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index 630a48d..6102aa6 100644
--- a/packages/SystemUI/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
@@ -25,7 +25,7 @@
<item>100</item>
</array>
<array name="batterymeter_color_values">
- <item>#FFFF3300</item>
+ <item>@*android:color/battery_saver_mode_color</item>
<item>#FFFFFFFF</item>
</array>
<array name="batterymeter_bolt_points">
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 0cc74a8..40870bf 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -23,7 +23,6 @@
<color name="system_bar_background_opaque">#ff000000</color>
<color name="system_bar_background_semi_transparent">#66000000</color> <!-- 40% black -->
<color name="system_bar_background_transparent">#00000000</color>
- <color name="system_bar_background_warning">#fff4511e</color><!-- deep orange 600 -->
<color name="notification_panel_solid_background">#ff000000</color>
<drawable name="status_bar_recents_app_thumbnail_background">#88000000</drawable>
<color name="status_bar_recents_app_label_color">#ffffffff</color>
@@ -45,6 +44,7 @@
<color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->
<color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200-->
<color name="qs_detail_transition">#66FFFFFF</color>
+ <color name="qs_detail_progress_track">#99009688</color><!-- 60% deep teal 500 -->
<color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white -->
<color name="data_usage_graph_track">#33FFFFFF</color><!-- 20% white -->
<color name="data_usage_graph_warning">#FFFFFFFF</color>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 28d7e29..42d9734 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -92,7 +92,7 @@
<!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false">
- wifi,bt,inversion,cell,airplane,rotation,flashlight,location,cast
+ wifi,bt,inversion,cell,airplane,rotation,flashlight,location,cast,hotspot
</string>
<!-- The tiles to display in QuickSettings -->
@@ -111,7 +111,7 @@
<bool name="config_show4GForLTE">true</bool>
<!-- milliseconds before the heads up notification auto-dismisses. -->
- <integer name="heads_up_notification_decay">3700</integer>
+ <integer name="heads_up_notification_decay">10000</integer>
<!-- milliseconds before the heads up notification accepts touches. -->
<integer name="heads_up_sensitivity_delay">700</integer>
@@ -157,7 +157,7 @@
<!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
card. -->
- <integer name="keyguard_max_notification_count">4</integer>
+ <integer name="keyguard_max_notification_count">3</integer>
<!-- Defines the implementation of the velocity tracker to be used for the panel expansion. Can
be 'platform' or 'noisy' (i.e. for noisy touch screens). -->
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 3db0a2b..c8db284 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -205,10 +205,10 @@
<dimen name="recents_task_view_rounded_corners_radius">2dp</dimen>
<!-- The min translation in the Z index for the last task. -->
- <dimen name="recents_task_view_z_min">5dp</dimen>
+ <dimen name="recents_task_view_z_min">25dp</dimen>
<!-- The max translation in the Z index for the last task. -->
- <dimen name="recents_task_view_z_max">65dp</dimen>
+ <dimen name="recents_task_view_z_max">100dp</dimen>
<!-- The amount to translate when animating the removal of a task. -->
<dimen name="recents_task_view_remove_anim_translation_x">100dp</dimen>
@@ -222,6 +222,9 @@
<!-- The amount to offset when animating into an affiliate group. -->
<dimen name="recents_task_view_affiliate_group_enter_offset">64dp</dimen>
+ <!-- The alpha to apply to a task thumbnail. -->
+ <item name="recents_task_view_thumbnail_alpha" format="float" type="dimen">0.9</item>
+
<!-- The height of a task view bar. -->
<dimen name="recents_task_bar_height">56dp</dimen>
@@ -320,7 +323,7 @@
<dimen name="volume_panel_z">3dp</dimen>
<!-- Distance between notifications and header when they are considered to be colliding. -->
- <dimen name="header_notifications_collide_distance">24dp</dimen>
+ <dimen name="header_notifications_collide_distance">48dp</dimen>
<!-- Distance the user needs to drag vertically such that a swipe is accepted to unlock the
device. -->
@@ -422,4 +425,21 @@
<!-- The width/height of the phone/camera/unlock icon on keyguard. -->
<dimen name="keyguard_affordance_height">56dp</dimen>
<dimen name="keyguard_affordance_width">56dp</dimen>
+
+ <dimen name="keyguard_indication_margin_bottom">65dp</dimen>
+
+ <!-- The text size for battery level -->
+ <dimen name="battery_level_text_size">12sp</dimen>
+
+ <!-- TrustDrawable: Minimum inner radius of the breathing animation -->
+ <dimen name="trust_circle_inner_radius_visible_min">22dp</dimen>
+ <!-- TrustDrawable: Maximum inner radius of the breathing animation -->
+ <dimen name="trust_circle_inner_radius_visible_max">24dp</dimen>
+ <!-- TrustDrawable: Inner radius at the end of the exit animation -->
+ <dimen name="trust_circle_inner_radius_exit">38dp</dimen>
+ <!-- TrustDrawable: Inner radius at the beginning of the enter animation -->
+ <dimen name="trust_circle_inner_radius_enter">18dp</dimen>
+ <!-- TrustDrawable: Thickness of the circle -->
+ <dimen name="trust_circle_thickness">2dp</dimen>
+
</resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 72886c6..1d33d7a 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -273,6 +273,13 @@
<!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_wifi_signal_full">Wifi signal full.</string>
+ <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_wifi_name">Connected to <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
+
+ <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_bluetooth_name">Connected to <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
+
+
<!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_no_wimax">No WiMAX.</string>
<!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -299,15 +306,6 @@
<!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_signal_full">Signal full.</string>
- <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_desc_on">On.</string>
- <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_desc_off">Off.</string>
- <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_desc_connected">Connected.</string>
- <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_desc_connecting">Connecting.</string>
-
<!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_data_connection_gprs">GPRS</string>
@@ -390,31 +388,82 @@
<string name="accessibility_desc_notification_shade">Notification shade.</string>
<!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_quick_settings">Quick settings.</string>
+ <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_desc_lock_screen">Lock screen.</string>
+ <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_desc_settings">Settings</string>
<!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_recent_apps">Recent screens.</string>
<!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
<!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="network" example="MyWifiNetwork">%2$s</xliff:g></string>
+ <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
+ <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_wifi_changed_off">Wifi turned off.</string>
+ <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_wifi_changed_on">Wifi turned on.</string>
<!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_mobile">Mobile <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>
<!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_battery">Battery <xliff:g id="state" example="50% charging">%s</xliff:g>.</string>
- <!-- Content description of the airplane mode tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_airplane">Airplane Mode <xliff:g id="state" example="Off">%s</xliff:g>.</string>
- <!-- Content description of the bluetooth tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_bluetooth">Bluetooth <xliff:g id="state" example="Off">%s</xliff:g>.</string>
- <!-- Content description of the location tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_location">Location <xliff:g id="state" example="Off">%s</xliff:g>.</string>
+ <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_airplane_off">Airplane mode off.</string>
+ <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_airplane_on">Airplane mode on.</string>
+ <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_airplane_changed_off">Airplane mode turned off.</string>
+ <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_airplane_changed_on">Airplane mode turned on.</string>
+ <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_off">Bluetooth off.</string>
+ <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_on">Bluetooth on.</string>
+ <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_connecting">Bluetooth connecting.</string>
+ <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_connected">Bluetooth connected.</string>
+ <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth turned off.</string>
+ <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth turned on.</string>
+ <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_location_off">Location reporting off.</string>
+ <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_location_on">Location reporting on.</string>
+ <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_location_changed_off">Location reporting turned off.</string>
+ <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_location_changed_on">Location reporting turned on.</string>
<!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_alarm">Alarm set for <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
<!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_close">Close panel</string>
+ <string name="accessibility_quick_settings_close">Close panel.</string>
<!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_more_time">More time</string>
+ <string name="accessibility_quick_settings_more_time">More time.</string>
<!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_less_time">Less time</string>
+ <string name="accessibility_quick_settings_less_time">Less time.</string>
+ <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_flashlight_off">Flashlight off.</string>
+ <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_flashlight_on">Flashlight on.</string>
+ <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_flashlight_changed_off">Flashlight turned off.</string>
+ <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_flashlight_changed_on">Flashlight turned on.</string>
+ <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_color_inversion_changed_off">Color inversion turned off.</string>
+ <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_color_inversion_changed_on">Color inversion turned on.</string>
+ <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_hotspot_changed_off">Mobile hotspot turned off.</string>
+ <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_quick_settings_hotspot_changed_on">Mobile hotspot turned on.</string>
+ <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_casting_turned_off">Screen casting stopped.</string>
+
+ <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_brightness">Display brightness</string>
<!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
<string name="data_usage_disabled_dialog_3g_title">2G-3G data is off</string>
@@ -466,6 +515,15 @@
<!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
<string name="accessibility_rotation_lock_on_portrait">Screen is locked in portrait orientation.</string>
+ <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_rotation_lock_off_changed">Screen will now rotate automatically.</string>
+
+ <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_rotation_lock_on_landscape_changed">Screen is now locked in landscape orientation.</string>
+
+ <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_rotation_lock_on_portrait_changed">Screen is now locked in portrait orientation.</string>
+
<!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
<string name="dessert_case">Dessert Case</string>
@@ -572,7 +630,7 @@
<!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
<string name="quick_settings_cellular_detail_remaining_data">Remaining data</string>
<!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
- <string name="quick_settings_cellular_detail_over_limit">Over limit</string>
+ <string name="quick_settings_cellular_detail_over_limit">Limit reached – data usage paused</string>
<!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
<string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> used</string>
<!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
@@ -643,7 +701,7 @@
<string name="speed_bump_explanation">Less urgent notifications below</string>
<!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
- <string name="notification_tap_again">Tap again to open</string>
+ <string name="notification_tap_again">Touch again to open</string>
<!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
<string name="keyguard_unlock">Swipe up to unlock</string>
@@ -654,8 +712,6 @@
<!-- Shows when people have clicked at the right edge of the screen to explain how to open the phone. In right-to-left languages, this is the opposite direction. [CHAR LIMIT=60] -->
<string name="camera_hint">Swipe left for camera</string>
- <string name="bugreport_tile_extended" translatable="false">%s\n%s (%s)</string>
-
<!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
<string name="zen_mode_forever">Indefinitely</string>
@@ -673,6 +729,12 @@
<!-- Related to user switcher --><skip/>
+ <!-- Accessibility label for the button that opens the user switcher. -->
+ <string name="accessibility_multi_user_switch_switcher">Switch user</string>
+
+ <!-- Accessibility label for the button that opens the quick contact of the user. -->
+ <string name="accessibility_multi_user_switch_quick_contact">Show profile</string>
+
<!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
<string name="user_add_user">Add user</string>
@@ -685,26 +747,29 @@
<!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
<string name="guest_new_guest">Add guest</string>
- <!-- Label for exiting guest session in the user switcher [CHAR LIMIT=35] -->
- <string name="guest_exit_guest">Exit guest</string>
+ <!-- Label for exiting and removing the guest session in the user switcher [CHAR LIMIT=35] -->
+ <string name="guest_exit_guest">Remove guest</string>
<!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
- <string name="guest_exit_guest_dialog_title">Exiting guest session?</string>
+ <string name="guest_exit_guest_dialog_title">Remove guest?</string>
<!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
- <string name="guest_exit_guest_dialog_message">Exiting the guest session will remove local data.</string>
+ <string name="guest_exit_guest_dialog_message">All apps and data in this session will be deleted.</string>
+
+ <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+ <string name="guest_exit_guest_dialog_remove">Remove</string>
<!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
<string name="guest_wipe_session_title">Welcome back, guest!</string>
<!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
- <string name="guest_wipe_session_message">Do you want to start a new session?</string>
+ <string name="guest_wipe_session_message">Do you want to continue your session?</string>
<!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
- <string name="guest_wipe_session_wipe">Yes</string>
+ <string name="guest_wipe_session_wipe">Start over</string>
<!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
- <string name="guest_wipe_session_dontwipe">No, thanks</string>
+ <string name="guest_wipe_session_dontwipe">Yes, continue</string>
<!-- Zen mode condition: time duration in minutes. [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 0d3a487..48a031a 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -21,11 +21,23 @@
</style>
<!-- Alternate Recents theme -->
- <style name="RecentsTheme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">
+ <style name="RecentsTheme" parent="@android:style/Theme">
+ <!-- NoTitle -->
+ <item name="android:windowNoTitle">true</item>
+ <!-- Wallpaper -->
+ <item name="android:windowBackground">@color/transparent</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
+ <!-- Misc -->
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowAnimationStyle">@style/Animation.RecentsActivity</item>
+ <item name="*android:lightingStyle">@style/RecentsLighting</item>
+ </style>
+
+ <style name="RecentsLighting" parent="@*android:style/Lighting">
+ <item name="*android:ambientShadowAlpha">0.30</item>
</style>
<!-- Animations for a non-full-screen window or activity. -->
@@ -108,49 +120,6 @@
<style name="TextAppearance.StatusBar.Expanded.UserSwitcher.UserName" />
<style name="TextAppearance" />
- <style name="TextAppearance.QuickSettings" />
-
- <style name="TextAppearance.QuickSettings.TileView">
- <item name="android:textSize">12dp</item>
- <item name="android:textStyle">normal</item>
- <item name="android:textColor">#CCCCCC</item>
- <item name="android:textAllCaps">true</item>
- <item name="android:paddingStart">6dp</item>
- <item name="android:paddingEnd">6dp</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.TileView.AllInOne" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:lines">2</item>
- <item name="android:gravity">top</item>
- <item name="android:paddingBottom">2dp</item>
- <item name="android:paddingTop">16dp</item>
- <item name="android:drawablePadding">8dp</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.Clock" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:textSize">20dp</item>
- <item name="android:textColor">@android:color/holo_blue_light</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.Date" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:textSize">14dp</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.Alarm" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:textSize">14dp</item>
- <item name="android:textColor">#ff3a3b39</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.CaCertWarning" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:textAllCaps">false</item>
- </style>
-
- <style name="TextAppearance.QuickSettings.TileView.User" parent="@style/TextAppearance.QuickSettings.TileView">
- <item name="android:background">#CC000000</item>
- <item name="android:padding">4dp</item>
- <item name="android:singleLine">true</item>
- <item name="android:fadingEdge">horizontal</item>
- </style>
<style name="TextAppearance.QS">
<item name="android:textStyle">normal</item>
@@ -211,7 +180,6 @@
<style name="BaseBrightnessDialogContainer">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_alignParentBottom">true</item>
</style>
<style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer" />
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index b9ffdbb..5e2f784 100755
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -33,7 +33,10 @@
import android.util.AttributeSet;
import android.view.View;
-public class BatteryMeterView extends View implements DemoMode {
+import com.android.systemui.statusbar.policy.BatteryController;
+
+public class BatteryMeterView extends View implements DemoMode,
+ BatteryController.BatteryStateChangeCallback {
public static final String TAG = BatteryMeterView.class.getSimpleName();
public static final String ACTION_LEVEL_TEST = "com.android.systemui.BATTERY_LEVEL_TEST";
@@ -68,6 +71,9 @@
private final Path mClipPath = new Path();
private final Path mTextPath = new Path();
+ private BatteryController mBatteryController;
+ private boolean mPowerSaveEnabled;
+
private class BatteryTracker extends BroadcastReceiver {
public static final int UNKNOWN_LEVEL = -1;
@@ -155,6 +161,7 @@
// preload the battery level
mTracker.onReceive(getContext(), sticky);
}
+ mBatteryController.addStateChangedCallback(this);
}
@Override
@@ -162,6 +169,7 @@
super.onDetachedFromWindow();
getContext().unregisterReceiver(mTracker);
+ mBatteryController.removeStateChangedCallback(this);
}
public BatteryMeterView(Context context) {
@@ -227,6 +235,22 @@
mBoltPoints = loadBoltPoints(res);
}
+ public void setBatteryController(BatteryController batteryController) {
+ mBatteryController = batteryController;
+ mPowerSaveEnabled = mBatteryController.isPowerSave();
+ }
+
+ @Override
+ public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
+ // TODO: Use this callback instead of own broadcast receiver.
+ }
+
+ @Override
+ public void onPowerSaveChanged() {
+ mPowerSaveEnabled = mBatteryController.isPowerSave();
+ invalidate();
+ }
+
private static float[] loadBoltPoints(Resources res) {
final int[] pts = res.getIntArray(R.array.batterymeter_bolt_points);
int maxX = 0, maxY = 0;
@@ -251,6 +275,11 @@
}
private int getColorForLevel(int percent) {
+
+ // If we are in power save mode, always use the normal color.
+ if (mPowerSaveEnabled) {
+ return mColors[mColors.length-1];
+ }
int thresh, color = 0;
for (int i=0; i<mColors.length; i+=2) {
thresh = mColors[i];
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
index b280ab7..ee699d2 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
@@ -208,6 +208,12 @@
checkPermission();
mKeyguardViewMediator.startKeyguardExitAnimation(startTime, fadeoutDuration);
}
+
+ @Override
+ public void onActivityDrawn() {
+ checkPermission();
+ mKeyguardViewMediator.onActivityDrawn();
+ }
};
}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 117515b..ad568b8 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -133,6 +133,7 @@
private static final int KEYGUARD_TIMEOUT = 13;
private static final int DISMISS = 17;
private static final int START_KEYGUARD_EXIT_ANIM = 18;
+ private static final int ON_ACTIVITY_DRAWN = 19;
/**
* The default amount of time we stay awake (used for all key input)
@@ -256,10 +257,12 @@
private boolean mWaitingUntilKeyguardVisible = false;
private LockPatternUtils mLockPatternUtils;
private boolean mKeyguardDonePending = false;
+ private boolean mHideAnimationRun = false;
private SoundPool mLockSounds;
private int mLockSoundId;
private int mUnlockSoundId;
+ private int mTrustedSoundId;
private int mLockSoundStreamId;
/**
@@ -287,6 +290,7 @@
// ActivityManagerService) will not reconstruct the keyguard if it is already showing.
synchronized (KeyguardViewMediator.this) {
mSwitchingUser = true;
+ mKeyguardDonePending = false;
resetStateLocked();
adjustStatusBarLocked();
// When we switch users we want to bring the new user to the biometric unlock even
@@ -431,12 +435,28 @@
@Override
public void keyguardDonePending() {
mKeyguardDonePending = true;
+ mHideAnimationRun = true;
+ mStatusBarKeyguardViewManager.startPreHideAnimation(null /* finishRunnable */);
}
@Override
public void keyguardGone() {
mKeyguardDisplayManager.hide();
}
+
+ @Override
+ public void readyForKeyguardDone() {
+ if (mKeyguardDonePending) {
+ // Somebody has called keyguardDonePending before, which means that we are
+ // authenticated
+ KeyguardViewMediator.this.keyguardDone(true /* authenticated */, true /* wakeUp */);
+ }
+ }
+
+ @Override
+ public void playTrustedSound() {
+ KeyguardViewMediator.this.playTrustedSound();
+ }
};
public void userActivity() {
@@ -486,6 +506,14 @@
if (soundPath == null || mUnlockSoundId == 0) {
Log.w(TAG, "failed to load unlock sound from " + soundPath);
}
+ soundPath = Settings.Global.getString(cr, Settings.Global.TRUSTED_SOUND);
+ if (soundPath != null) {
+ mTrustedSoundId = mLockSounds.load(soundPath, 1);
+ }
+ if (soundPath == null || mTrustedSoundId == 0) {
+ Log.w(TAG, "failed to load trusted sound from " + soundPath);
+ }
+
int lockSoundDefaultAttenuation = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lockSoundVolumeDb);
mLockSoundVolume = (float)Math.pow(10, (float)lockSoundDefaultAttenuation/20);
@@ -545,6 +573,7 @@
if (DEBUG) Log.d(TAG, "onScreenTurnedOff(" + why + ")");
mKeyguardDonePending = false;
+ mHideAnimationRun = false;
// Lock immediately based on setting if secure (user has a pin/pattern/password).
// This also "locks" the device when not secure to provide easy access to the
@@ -1067,6 +1096,9 @@
StartKeyguardExitAnimParams params = (StartKeyguardExitAnimParams) msg.obj;
handleStartKeyguardExitAnimation(params.startTime, params.fadeoutDuration);
break;
+ case ON_ACTIVITY_DRAWN:
+ handleOnActivityDrawn();
+ break;
}
}
};
@@ -1137,11 +1169,14 @@
return;
}
+ playSound(locked ? mLockSoundId : mUnlockSoundId);
+ }
+
+ private void playSound(int soundId) {
+ if (soundId == 0) return;
final ContentResolver cr = mContext.getContentResolver();
if (Settings.System.getInt(cr, Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1) == 1) {
- final int whichSound = locked
- ? mLockSoundId
- : mUnlockSoundId;
+
mLockSounds.stop(mLockSoundStreamId);
// Init mAudioManager
if (mAudioManager == null) {
@@ -1152,11 +1187,18 @@
// If the stream is muted, don't play the sound
if (mAudioManager.isStreamMute(mMasterStreamType)) return;
- mLockSoundStreamId = mLockSounds.play(whichSound,
+ mLockSoundStreamId = mLockSounds.play(soundId,
mLockSoundVolume, mLockSoundVolume, 1/*priortiy*/, 0/*loop*/, 1.0f/*rate*/);
}
}
+ private void playTrustedSound() {
+ if (mSuppressNextLockSound) {
+ return;
+ }
+ playSound(mTrustedSoundId);
+ }
+
private void updateActivityLockScreenState() {
try {
ActivityManagerNative.getDefault().setLockScreenShown(mShowing && !mOccluded);
@@ -1181,6 +1223,7 @@
mHiding = false;
mShowing = true;
mKeyguardDonePending = false;
+ mHideAnimationRun = false;
updateActivityLockScreenState();
adjustStatusBarLocked();
userActivity();
@@ -1193,6 +1236,22 @@
mKeyguardDisplayManager.show();
}
+ private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {
+ @Override
+ public void run() {
+ try {
+ // Don't actually hide the Keyguard at the moment, wait for window
+ // manager until it tells us it's safe to do so with
+ // startKeyguardExitAnimation.
+ mWM.keyguardGoingAway(
+ mStatusBarKeyguardViewManager.shouldDisableWindowAnimationsForUnlock(),
+ mStatusBarKeyguardViewManager.isGoingToNotificationShade());
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error while calling WindowManager", e);
+ }
+ }
+ };
+
/**
* Handle message sent by {@link #hideLocked()}
* @see #HIDE
@@ -1203,19 +1262,11 @@
mHiding = true;
if (mShowing && !mOccluded) {
- mStatusBarKeyguardViewManager.startPreHideAnimation(new Runnable() {
- @Override
- public void run() {
- try {
- // Don't actually hide the Keyguard at the moment, wait for window
- // manager until it tells us it's safe to do so with
- // startKeyguardExitAnimation.
- mWM.keyguardGoingAway();
- } catch (RemoteException e) {
- Log.e(TAG, "Error while calling WindowManager", e);
- }
- }
- });
+ if (!mHideAnimationRun) {
+ mStatusBarKeyguardViewManager.startPreHideAnimation(mKeyguardGoingAwayRunnable);
+ } else {
+ mKeyguardGoingAwayRunnable.run();
+ }
} else {
// Don't try to rely on WindowManager - if Keyguard wasn't showing, window
@@ -1227,6 +1278,12 @@
}
}
+ private void handleOnActivityDrawn() {
+ if (mKeyguardDonePending) {
+ mStatusBarKeyguardViewManager.onActivityDrawn();
+ }
+ }
+
private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) {
synchronized (KeyguardViewMediator.this) {
@@ -1244,6 +1301,7 @@
mStatusBarKeyguardViewManager.hide(startTime, fadeoutDuration);
mShowing = false;
mKeyguardDonePending = false;
+ mHideAnimationRun = false;
updateActivityLockScreenState();
adjustStatusBarLocked();
}
@@ -1357,6 +1415,9 @@
mHandler.sendMessage(msg);
}
+ public void onActivityDrawn() {
+ mHandler.sendEmptyMessage(ON_ACTIVITY_DRAWN);
+ }
public ViewMediatorCallback getViewMediatorCallback() {
return mViewMediatorCallback;
}
diff --git a/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java b/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
index f8b347c..803a014 100644
--- a/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java
@@ -17,6 +17,7 @@
package com.android.systemui.media;
import android.content.Context;
+import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
@@ -45,11 +46,11 @@
Context context;
Uri uri;
boolean looping;
- int stream;
+ AudioAttributes attributes;
long requestTime;
public String toString() {
- return "{ code=" + code + " looping=" + looping + " stream=" + stream
+ return "{ code=" + code + " looping=" + looping + " attributes=" + attributes
+ " uri=" + uri + " }";
}
}
@@ -79,7 +80,7 @@
(AudioManager) mCmd.context.getSystemService(Context.AUDIO_SERVICE);
try {
MediaPlayer player = new MediaPlayer();
- player.setAudioStreamType(mCmd.stream);
+ player.setAudioAttributes(mCmd.attributes);
player.setDataSource(mCmd.context, mCmd.uri);
player.setLooping(mCmd.looping);
player.prepare();
@@ -90,10 +91,12 @@
if (mAudioManagerWithAudioFocus == null) {
if (mDebug) Log.d(mTag, "requesting AudioFocus");
if (mCmd.looping) {
- audioManager.requestAudioFocus(null, mCmd.stream,
+ audioManager.requestAudioFocus(null,
+ AudioAttributes.toLegacyStreamType(mCmd.attributes),
AudioManager.AUDIOFOCUS_GAIN);
} else {
- audioManager.requestAudioFocus(null, mCmd.stream,
+ audioManager.requestAudioFocus(null,
+ AudioAttributes.toLegacyStreamType(mCmd.attributes),
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
}
mAudioManagerWithAudioFocus = audioManager;
@@ -280,7 +283,9 @@
* (see {@link MediaPlayer#setLooping(boolean)})
* @param stream the AudioStream to use.
* (see {@link MediaPlayer#setAudioStreamType(int)})
+ * @deprecated use {@link #play(Context, Uri, boolean, AudioAttributes)} instead.
*/
+ @Deprecated
public void play(Context context, Uri uri, boolean looping, int stream) {
Command cmd = new Command();
cmd.requestTime = SystemClock.uptimeMillis();
@@ -288,7 +293,34 @@
cmd.context = context;
cmd.uri = uri;
cmd.looping = looping;
- cmd.stream = stream;
+ cmd.attributes = new AudioAttributes.Builder().setInternalLegacyStreamType(stream).build();
+ synchronized (mCmdQueue) {
+ enqueueLocked(cmd);
+ mState = PLAY;
+ }
+ }
+
+ /**
+ * Start playing the sound. It will actually start playing at some
+ * point in the future. There are no guarantees about latency here.
+ * Calling this before another audio file is done playing will stop
+ * that one and start the new one.
+ *
+ * @param context Your application's context.
+ * @param uri The URI to play. (see {@link MediaPlayer#setDataSource(Context, Uri)})
+ * @param looping Whether the audio should loop forever.
+ * (see {@link MediaPlayer#setLooping(boolean)})
+ * @param attributes the AudioAttributes to use.
+ * (see {@link MediaPlayer#setAudioAttributes(AudioAttributes)})
+ */
+ public void play(Context context, Uri uri, boolean looping, AudioAttributes attributes) {
+ Command cmd = new Command();
+ cmd.requestTime = SystemClock.uptimeMillis();
+ cmd.code = PLAY;
+ cmd.context = context;
+ cmd.uri = uri;
+ cmd.looping = looping;
+ cmd.attributes = attributes;
synchronized (mCmdQueue) {
enqueueLocked(cmd);
mState = PLAY;
diff --git a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java
index 5b4bb2c..7eed7f2 100644
--- a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.media.AudioAttributes;
import android.media.IAudioService;
import android.media.IRingtonePlayer;
import android.media.Ringtone;
@@ -71,11 +72,11 @@
private final IBinder mToken;
private final Ringtone mRingtone;
- public Client(IBinder token, Uri uri, UserHandle user, int streamType) {
+ public Client(IBinder token, Uri uri, UserHandle user, AudioAttributes aa) {
mToken = token;
mRingtone = new Ringtone(getContextForUser(user), false);
- mRingtone.setStreamType(streamType);
+ mRingtone.setAudioAttributes(aa);
mRingtone.setUri(uri);
}
@@ -91,7 +92,7 @@
private IRingtonePlayer mCallback = new IRingtonePlayer.Stub() {
@Override
- public void play(IBinder token, Uri uri, int streamType) throws RemoteException {
+ public void play(IBinder token, Uri uri, AudioAttributes aa) throws RemoteException {
if (LOGD) {
Log.d(TAG, "play(token=" + token + ", uri=" + uri + ", uid="
+ Binder.getCallingUid() + ")");
@@ -101,7 +102,7 @@
client = mClients.get(token);
if (client == null) {
final UserHandle user = Binder.getCallingUserHandle();
- client = new Client(token, uri, user, streamType);
+ client = new Client(token, uri, user, aa);
token.linkToDeath(client, 0);
mClients.put(token, client);
}
@@ -137,13 +138,13 @@
}
@Override
- public void playAsync(Uri uri, UserHandle user, boolean looping, int streamType) {
+ public void playAsync(Uri uri, UserHandle user, boolean looping, AudioAttributes aa) {
if (LOGD) Log.d(TAG, "playAsync(uri=" + uri + ", user=" + user + ")");
if (Binder.getCallingUid() != Process.SYSTEM_UID) {
throw new SecurityException("Async playback only available from system UID.");
}
- mAsyncPlayer.play(getContextForUser(user), uri, looping, streamType);
+ mAsyncPlayer.play(getContextForUser(user), uri, looping, aa);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
index 1ac8295..b3c0783 100644
--- a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
@@ -63,13 +63,13 @@
});
final Dialog dialog = builder.create();
+ dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
public void onDismiss(DialogInterface dialog) {
finish();
}
});
- dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.show();
}
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerDialogWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerDialogWarnings.java
deleted file mode 100644
index 79fadbd..0000000
--- a/packages/SystemUI/src/com/android/systemui/power/PowerDialogWarnings.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.power;
-
-import android.app.ActivityManagerNative;
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.util.Slog;
-import android.view.ContextThemeWrapper;
-import android.view.WindowManager;
-
-import com.android.systemui.R;
-
-import java.io.PrintWriter;
-
-public class PowerDialogWarnings implements PowerUI.WarningsUI {
- private static final String TAG = PowerUI.TAG + ".Dialog";
- private static final boolean DEBUG = PowerUI.DEBUG;
-
- private final Context mContext;
-
- private int mBatteryLevel;
- private int mBucket;
- private long mScreenOffTime;
- private boolean mSaver;
-
- private AlertDialog mInvalidChargerDialog;
- private AlertDialog mLowBatteryDialog;
-
- public PowerDialogWarnings(Context context) {
- mContext = new ContextThemeWrapper(context, android.R.style.Theme_DeviceDefault_Light);
- }
-
- @Override
- public void dump(PrintWriter pw) {
- pw.print("mInvalidChargerDialog=");
- pw.println(mInvalidChargerDialog == null ? "null" : mInvalidChargerDialog.toString());
- pw.print("mLowBatteryDialog=");
- pw.println(mLowBatteryDialog == null ? "null" : mLowBatteryDialog.toString());
- }
-
- @Override
- public void update(int batteryLevel, int bucket, long screenOffTime) {
- mBatteryLevel = batteryLevel;
- mBucket = bucket;
- mScreenOffTime = screenOffTime;
- }
-
- @Override
- public boolean isInvalidChargerWarningShowing() {
- return mInvalidChargerDialog != null;
- }
-
- @Override
- public void updateLowBatteryWarning() {
- if (mLowBatteryDialog != null) {
- showLowBatteryWarning(false /*playSound*/);
- }
- }
-
- @Override
- public void dismissLowBatteryWarning() {
- if (mLowBatteryDialog != null) {
- Slog.i(TAG, "closing low battery warning: level=" + mBatteryLevel);
- mLowBatteryDialog.dismiss();
- }
- }
-
- @Override
- public void showLowBatteryWarning(boolean playSound) {
- Slog.i(TAG,
- ((mLowBatteryDialog == null) ? "showing" : "updating")
- + " low battery warning: level=" + mBatteryLevel
- + " [" + mBucket + "]");
-
- final int textRes = mSaver ? R.string.battery_low_percent_format_saver_started
- : R.string.battery_low_percent_format;
- final CharSequence levelText = mContext.getString(textRes, mBatteryLevel);
-
- if (mLowBatteryDialog != null) {
- mLowBatteryDialog.setMessage(levelText);
- } else {
- AlertDialog.Builder b = new AlertDialog.Builder(mContext);
- b.setCancelable(true);
- b.setTitle(R.string.battery_low_title);
- b.setMessage(levelText);
- b.setPositiveButton(android.R.string.ok, null);
-
- final Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
- | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
- | Intent.FLAG_ACTIVITY_NO_HISTORY);
- if (intent.resolveActivity(mContext.getPackageManager()) != null) {
- b.setNegativeButton(R.string.battery_low_why,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- try {
- ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
- } catch (RemoteException e) {
- // we tried
- }
- mContext.startActivityAsUser(intent, UserHandle.CURRENT);
- dismissLowBatteryWarning();
- }
- });
- }
-
- AlertDialog d = b.create();
- d.setOnDismissListener(new DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialog) {
- mLowBatteryDialog = null;
- }
- });
- d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
- d.getWindow().getAttributes().privateFlags |=
- WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
- d.show();
- mLowBatteryDialog = d;
- if (playSound) {
- playLowBatterySound();
- }
- }
- }
-
- private void playLowBatterySound() {
- final ContentResolver cr = mContext.getContentResolver();
-
- final int silenceAfter = Settings.Global.getInt(cr,
- Settings.Global.LOW_BATTERY_SOUND_TIMEOUT, 0);
- final long offTime = SystemClock.elapsedRealtime() - mScreenOffTime;
- if (silenceAfter > 0
- && mScreenOffTime > 0
- && offTime > silenceAfter) {
- Slog.i(TAG, "screen off too long (" + offTime + "ms, limit " + silenceAfter
- + "ms): not waking up the user with low battery sound");
- return;
- }
-
- if (DEBUG) {
- Slog.d(TAG, "playing low battery sound. pick-a-doop!"); // WOMP-WOMP is deprecated
- }
-
- if (Settings.Global.getInt(cr, Settings.Global.POWER_SOUNDS_ENABLED, 1) == 1) {
- final String soundPath = Settings.Global.getString(cr,
- Settings.Global.LOW_BATTERY_SOUND);
- if (soundPath != null) {
- final Uri soundUri = Uri.parse("file://" + soundPath);
- if (soundUri != null) {
- final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);
- if (sfx != null) {
- sfx.setStreamType(AudioManager.STREAM_SYSTEM);
- sfx.play();
- }
- }
- }
- }
- }
-
- @Override
- public void dismissInvalidChargerWarning() {
- if (mInvalidChargerDialog != null) {
- mInvalidChargerDialog.dismiss();
- }
- }
-
- @Override
- public void showInvalidChargerWarning() {
- Slog.d(TAG, "showing invalid charger dialog");
-
- dismissLowBatteryWarning();
-
- AlertDialog.Builder b = new AlertDialog.Builder(mContext);
- b.setCancelable(true);
- b.setTitle(R.string.invalid_charger_title);
- b.setMessage(R.string.invalid_charger_text);
- b.setPositiveButton(android.R.string.ok, null);
-
- AlertDialog d = b.create();
- d.setOnDismissListener(new DialogInterface.OnDismissListener() {
- public void onDismiss(DialogInterface dialog) {
- mInvalidChargerDialog = null;
- }
- });
-
- d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
- d.getWindow().getAttributes().privateFlags |=
- WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
- d.show();
- mInvalidChargerDialog = d;
- }
-
- @Override
- public void showSaverMode(boolean mode) {
- mSaver = mode;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
index dd923e3..bd1ef7a 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
@@ -38,6 +38,7 @@
import android.view.View;
import com.android.systemui.R;
+import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.phone.SystemUIDialog;
import java.io.PrintWriter;
@@ -48,7 +49,6 @@
private static final String TAG_NOTIFICATION = "low_battery";
private static final int ID_NOTIFICATION = 100;
- private static final int AUTO_DISMISS_MS = 10000;
private static final int SHOWING_NOTHING = 0;
private static final int SHOWING_WARNING = 1;
@@ -61,8 +61,6 @@
"SHOWING_INVALID_CHARGER",
};
- private static final String ACTION_SHOW_FALLBACK_WARNING = "PNW.warningFallback";
- private static final String ACTION_SHOW_FALLBACK_CHARGER = "PNW.chargerFallback";
private static final String ACTION_SHOW_BATTERY_SETTINGS = "PNW.batterySettings";
private static final String ACTION_START_SAVER = "PNW.startSaver";
private static final String ACTION_STOP_SAVER = "PNW.stopSaver";
@@ -75,7 +73,6 @@
private final Context mContext;
private final NotificationManager mNoMan;
private final Handler mHandler = new Handler();
- private final PowerDialogWarnings mFallbackDialogs;
private final Receiver mReceiver = new Receiver();
private final Intent mOpenBatterySettings = settings(Intent.ACTION_POWER_USAGE_SUMMARY);
private final Intent mOpenSaverSettings = settings(Settings.ACTION_BATTERY_SAVER_SETTINGS);
@@ -93,10 +90,9 @@
private boolean mInvalidCharger;
private SystemUIDialog mSaverConfirmation;
- public PowerNotificationWarnings(Context context) {
+ public PowerNotificationWarnings(Context context, PhoneStatusBar phoneStatusBar) {
mContext = context;
mNoMan = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
- mFallbackDialogs = new PowerDialogWarnings(context);
mReceiver.init();
}
@@ -120,7 +116,6 @@
}
mBucket = bucket;
mScreenOffTime = screenOffTime;
- mFallbackDialogs.update(batteryLevel, bucket, screenOffTime);
}
@Override
@@ -133,8 +128,8 @@
}
private void updateNotification() {
- if (DEBUG) Slog.d(TAG, "updateNotification mWarning=" + mWarning
- + " mSaver=" + mSaver + " mInvalidCharger=" + mInvalidCharger);
+ if (DEBUG) Slog.d(TAG, "updateNotification mWarning=" + mWarning + " mPlaySound="
+ + mPlaySound + " mSaver=" + mSaver + " mInvalidCharger=" + mInvalidCharger);
if (mInvalidCharger) {
showInvalidChargerNotification();
mShowing = SHOWING_INVALID_CHARGER;
@@ -161,7 +156,8 @@
.setPriority(Notification.PRIORITY_MAX)
.setCategory(Notification.CATEGORY_SYSTEM)
.setVisibility(Notification.VISIBILITY_PUBLIC)
- .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_CHARGER), true);
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
final Notification n = nb.build();
if (n.headsUpContentView != null) {
n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE);
@@ -179,12 +175,12 @@
.setShowWhen(false)
.setContentTitle(mContext.getString(R.string.battery_low_title))
.setContentText(mContext.getString(textRes, mBatteryLevel))
- .setOngoing(true)
.setOnlyAlertOnce(true)
.setPriority(Notification.PRIORITY_MAX)
.setCategory(Notification.CATEGORY_SYSTEM)
.setVisibility(Notification.VISIBILITY_PUBLIC)
- .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_WARNING), true);
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.battery_saver_mode_color));
if (hasBatterySettings()) {
nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SETTINGS));
}
@@ -213,7 +209,9 @@
.setOngoing(true)
.setShowWhen(false)
.setCategory(Notification.CATEGORY_SYSTEM)
- .setVisibility(Notification.VISIBILITY_PUBLIC);
+ .setVisibility(Notification.VISIBILITY_PUBLIC)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.battery_saver_mode_color));
addStopSaverAction(nb);
if (hasSaverSettings()) {
nb.setContentIntent(pendingActivity(mOpenSaverSettings));
@@ -259,14 +257,12 @@
@Override
public void updateLowBatteryWarning() {
updateNotification();
- mFallbackDialogs.updateLowBatteryWarning();
}
@Override
public void dismissLowBatteryWarning() {
if (DEBUG) Slog.d(TAG, "dismissing low battery warning: level=" + mBatteryLevel);
dismissLowBatteryNotification();
- mFallbackDialogs.dismissLowBatteryWarning();
}
private void dismissLowBatteryNotification() {
@@ -291,8 +287,6 @@
mPlaySound = playSound;
mWarning = true;
updateNotification();
- mHandler.removeCallbacks(mDismissLowBatteryNotification);
- mHandler.postDelayed(mDismissLowBatteryNotification, AUTO_DISMISS_MS);
}
private void attachLowBatterySound(Notification.Builder b) {
@@ -329,7 +323,6 @@
@Override
public void dismissInvalidChargerWarning() {
dismissInvalidChargerNotification();
- mFallbackDialogs.dismissInvalidChargerWarning();
}
private void dismissInvalidChargerNotification() {
@@ -371,8 +364,6 @@
public void init() {
IntentFilter filter = new IntentFilter();
- filter.addAction(ACTION_SHOW_FALLBACK_WARNING);
- filter.addAction(ACTION_SHOW_FALLBACK_CHARGER);
filter.addAction(ACTION_SHOW_BATTERY_SETTINGS);
filter.addAction(ACTION_START_SAVER);
filter.addAction(ACTION_STOP_SAVER);
@@ -383,13 +374,7 @@
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
Slog.i(TAG, "Received " + action);
- if (action.equals(ACTION_SHOW_FALLBACK_WARNING)) {
- dismissLowBatteryNotification();
- mFallbackDialogs.showLowBatteryWarning(false /*playSound*/);
- } else if (action.equals(ACTION_SHOW_FALLBACK_CHARGER)) {
- dismissInvalidChargerNotification();
- mFallbackDialogs.showInvalidChargerWarning();
- } else if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) {
+ if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) {
dismissLowBatteryNotification();
mContext.startActivityAsUser(mOpenBatterySettings, UserHandle.CURRENT);
} else if (action.equals(ACTION_START_SAVER)) {
@@ -414,11 +399,4 @@
});
}
};
-
- private final Runnable mDismissLowBatteryNotification = new Runnable() {
- @Override
- public void run() {
- dismissLowBatteryNotification();
- }
- };
}
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
index ccef8eb..d3c7dee 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
@@ -32,6 +32,7 @@
import android.util.Slog;
import com.android.systemui.SystemUI;
+import com.android.systemui.statusbar.phone.PhoneStatusBar;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -59,7 +60,7 @@
public void start() {
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
mScreenOffTime = mPowerManager.isScreenOn() ? -1 : SystemClock.elapsedRealtime();
- mWarnings = new PowerNotificationWarnings(mContext);
+ mWarnings = new PowerNotificationWarnings(mContext, getComponent(PhoneStatusBar.class));
ContentObserver obs = new ContentObserver(mHandler) {
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
index 9c1ff9d..eb4560d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
@@ -46,7 +46,11 @@
r = (int) Math.max(r, Math.ceil(Math.sqrt(w * w + y * y)));
r = (int) Math.max(r, Math.ceil(Math.sqrt(w * w + h * h)));
r = (int) Math.max(r, Math.ceil(Math.sqrt(x * x + h * h)));
- mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, 0, r);
+ if (in) {
+ mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, 0, r);
+ } else {
+ mAnimator = ViewAnimationUtils.createCircularReveal(mDetail, x, y, r, 0);
+ }
mAnimator.setDuration((long)(mAnimator.getDuration() * 1.5));
if (listener != null) {
mAnimator.addListener(listener);
@@ -55,12 +59,11 @@
if (in) {
mBackground.startTransition((int)(mAnimator.getDuration() * 0.6));
mAnimator.addListener(mVisibleOnStart);
- mAnimator.start();
} else {
mDetail.postDelayed(mReverseBackground, (long)(mAnimator.getDuration() * 0.65));
mAnimator.addListener(mGoneOnEnd);
- mAnimator.reverse();
}
+ mAnimator.start();
}
private final Runnable mReverseBackground = new Runnable() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
index f04a7b6..bfbc56c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
@@ -51,6 +51,10 @@
private QSTileHost mHost;
private Handler mHandler;
+ private boolean mIsVisible;
+ private boolean mIsIconVisible;
+ private int mFooterTextId;
+
public QSFooter(QSPanel qsPanel, Context context) {
mRootView = LayoutInflater.from(context)
.inflate(R.layout.quick_settings_footer, qsPanel, false);
@@ -99,16 +103,17 @@
private void handleRefreshState() {
if (mSecurityController.hasDeviceOwner()) {
- mFooterText.setText(R.string.device_owned_footer);
- mRootView.setVisibility(View.VISIBLE);
- mFooterIcon.setVisibility(View.INVISIBLE);
+ mFooterTextId = R.string.device_owned_footer;
+ mIsVisible = true;
+ mIsIconVisible = false;
} else if (mSecurityController.isVpnEnabled()) {
- mFooterText.setText(R.string.vpn_footer);
- mRootView.setVisibility(View.VISIBLE);
- mFooterIcon.setVisibility(View.VISIBLE);
+ mFooterTextId = R.string.vpn_footer;
+ mIsVisible = true;
+ mIsIconVisible = true;
} else {
- mRootView.setVisibility(View.GONE);
+ mIsVisible = false;
}
+ mRootView.post(mUpdateDisplayState);
}
@Override
@@ -181,6 +186,17 @@
return R.string.monitoring_title;
}
+ private final Runnable mUpdateDisplayState = new Runnable() {
+ @Override
+ public void run() {
+ if (mFooterTextId != 0) {
+ mFooterText.setText(mFooterTextId);
+ }
+ mRootView.setVisibility(mIsVisible ? View.VISIBLE : View.GONE);
+ mFooterIcon.setVisibility(mIsIconVisible ? View.VISIBLE : View.INVISIBLE);
+ }
+ };
+
private class Callback implements VpnCallback {
@Override
public void onVpnStateChanged() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index c3144c1..c1fd509 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -234,10 +234,16 @@
}
@Override
public void onScanStateChanged(boolean state) {
+ r.scanState = state;
if (mDetailRecord == r) {
- fireScanStateChanged(state);
+ fireScanStateChanged(r.scanState);
}
}
+
+ @Override
+ public void onAnnouncementRequested(CharSequence announcement) {
+ announceForAccessibility(announcement);
+ }
};
r.tile.setCallback(callback);
final View.OnClickListener click = new View.OnClickListener() {
@@ -310,9 +316,10 @@
mDetailContent.removeAllViews();
mDetail.bringToFront();
mDetailContent.addView(r.detailView);
- mDetailRecord = r;
+ setDetailRecord(r);
} else {
listener = mTeardownDetailWhenDone;
+ fireScanStateChanged(false);
}
fireShowingDetail(show ? detailAdapter : null);
mClipper.animateCircularClip(x, y, show, listener);
@@ -345,8 +352,8 @@
}
for (TileRecord record : mRecords) {
- if (record.tileView.getVisibility() == GONE) continue;
record.tileView.setDual(record.tile.supportsDualTargets());
+ if (record.tileView.getVisibility() == GONE) continue;
final int cw = record.row == 0 ? mLargeCellWidth : mCellWidth;
final int ch = record.row == 0 ? mLargeCellHeight : mCellHeight;
record.tileView.measure(exactly(cw), exactly(ch));
@@ -425,6 +432,14 @@
}
}
+ private void setDetailRecord(Record r) {
+ if (r == mDetailRecord) return;
+ mDetailRecord = r;
+ final boolean scanState = mDetailRecord instanceof TileRecord
+ && ((TileRecord) mDetailRecord).scanState;
+ fireScanStateChanged(scanState);
+ }
+
private class H extends Handler {
private static final int SHOW_DETAIL = 1;
private static final int SET_TILE_VISIBILITY = 2;
@@ -448,12 +463,13 @@
QSTileView tileView;
int row;
int col;
+ boolean scanState;
}
private final AnimatorListenerAdapter mTeardownDetailWhenDone = new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator animation) {
mDetailContent.removeAllViews();
- mDetailRecord = null;
+ setDetailRecord(null);
};
};
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index 6975541..876652c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -60,6 +60,7 @@
private Callback mCallback;
protected final TState mState = newTileState();
private final TState mTmpState = newTileState();
+ private boolean mAnnounceNextStateChange;
abstract protected TState newTileState();
abstract protected void handleClick();
@@ -161,9 +162,25 @@
}
private void handleStateChanged() {
+ boolean delayAnnouncement = shouldAnnouncementBeDelayed();
if (mCallback != null) {
mCallback.onStateChanged(mState);
+ if (mAnnounceNextStateChange && !delayAnnouncement) {
+ String announcement = composeChangeAnnouncement();
+ if (announcement != null) {
+ mCallback.onAnnouncementRequested(announcement);
+ }
+ }
}
+ mAnnounceNextStateChange = mAnnounceNextStateChange && delayAnnouncement;
+ }
+
+ protected boolean shouldAnnouncementBeDelayed() {
+ return false;
+ }
+
+ protected String composeChangeAnnouncement() {
+ return null;
}
private void handleShowDetail(boolean show) {
@@ -217,6 +234,7 @@
handleSetCallback((QSTile.Callback)msg.obj);
} else if (msg.what == CLICK) {
name = "handleClick";
+ mAnnounceNextStateChange = true;
handleClick();
} else if (msg.what == SECONDARY_CLICK) {
name = "handleSecondaryClick";
@@ -255,6 +273,7 @@
void onShowDetail(boolean show);
void onToggleStateChanged(boolean state);
void onScanStateChanged(boolean state);
+ void onAnnouncementRequested(CharSequence announcement);
}
public interface Host {
@@ -286,6 +305,7 @@
public Drawable icon;
public String label;
public String contentDescription;
+ public String dualLabelContentDescription;
public boolean copyTo(State other) {
if (other == null) throw new IllegalArgumentException();
@@ -294,12 +314,15 @@
|| other.iconId != iconId
|| !Objects.equals(other.icon, icon)
|| !Objects.equals(other.label, label)
- || !Objects.equals(other.contentDescription, contentDescription);
+ || !Objects.equals(other.contentDescription, contentDescription)
+ || !Objects.equals(other.dualLabelContentDescription,
+ dualLabelContentDescription);
other.visible = visible;
other.iconId = iconId;
other.icon = icon;
other.label = label;
other.contentDescription = contentDescription;
+ other.dualLabelContentDescription = dualLabelContentDescription;
return changed;
}
@@ -315,6 +338,7 @@
sb.append(",icon=").append(icon);
sb.append(",label=").append(label);
sb.append(",contentDescription=").append(contentDescription);
+ sb.append(",dualLabelContentDescription=").append(dualLabelContentDescription);
return sb.append(']');
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index 597bb93..2cc1f07 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -87,6 +87,7 @@
private void recreateLabel() {
CharSequence labelText = null;
+ CharSequence labelDescription = null;
if (mLabel != null) {
labelText = mLabel.getText();
removeView(mLabel);
@@ -94,6 +95,7 @@
}
if (mDualLabel != null) {
labelText = mDualLabel.getText();
+ labelDescription = mLabel.getContentDescription();
removeView(mDualLabel);
mDualLabel = null;
}
@@ -113,6 +115,9 @@
if (labelText != null) {
mDualLabel.setText(labelText);
}
+ if (labelDescription != null) {
+ mDualLabel.setContentDescription(labelDescription);
+ }
addView(mDualLabel);
} else {
mLabel = new TextView(mContext);
@@ -228,6 +233,7 @@
}
if (mDual) {
mDualLabel.setText(state.label);
+ mDualLabel.setContentDescription(state.dualLabelContentDescription);
} else {
mLabel.setText(state.label);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
index 1a555f1..1df3d20 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
@@ -89,11 +89,9 @@
protected void handleStateChanged(QSTile.State state) {
super.handleStateChanged(state);
final SignalState s = (SignalState) state;
- mSignal.setImageDrawable(null); // force refresh
mSignal.setImageResource(s.iconId);
if (s.overlayIconId > 0) {
mOverlay.setVisibility(VISIBLE);
- mOverlay.setImageDrawable(null); // force refresh
mOverlay.setImageResource(s.overlayIconId);
} else {
mOverlay.setVisibility(GONE);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java
index 5d1fa80..51401c8 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java
@@ -70,13 +70,20 @@
if (airplaneMode) {
state.iconId = R.drawable.ic_qs_airplane_on;
state.contentDescription = mContext.getString(
- R.string.accessibility_quick_settings_airplane,
- mContext.getString(R.string.accessibility_desc_on));
+ R.string.accessibility_quick_settings_airplane_on);
} else {
state.iconId = R.drawable.ic_qs_airplane_off;
state.contentDescription = mContext.getString(
- R.string.accessibility_quick_settings_airplane,
- mContext.getString(R.string.accessibility_desc_off));
+ R.string.accessibility_quick_settings_airplane_off);
+ }
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(R.string.accessibility_quick_settings_airplane_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_airplane_changed_off);
}
}
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 1b2c0b0..63c880f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -88,21 +88,22 @@
final boolean connecting = mController.isBluetoothConnecting();
state.visible = supported;
state.value = enabled;
- final String stateContentDescription;
if (enabled) {
state.label = null;
if (connected) {
state.iconId = R.drawable.ic_qs_bluetooth_connected;
- stateContentDescription = mContext.getString(R.string.accessibility_desc_connected);
+ state.contentDescription = mContext.getString(
+ R.string.accessibility_quick_settings_bluetooth_connected);
state.label = mController.getLastDeviceName();
} else if (connecting) {
state.iconId = R.drawable.ic_qs_bluetooth_connecting;
- stateContentDescription =
- mContext.getString(R.string.accessibility_desc_connecting);
+ state.contentDescription = mContext.getString(
+ R.string.accessibility_quick_settings_bluetooth_connecting);
state.label = mContext.getString(R.string.quick_settings_bluetooth_label);
} else {
state.iconId = R.drawable.ic_qs_bluetooth_on;
- stateContentDescription = mContext.getString(R.string.accessibility_desc_on);
+ state.contentDescription = mContext.getString(
+ R.string.accessibility_quick_settings_bluetooth_on);
}
if (TextUtils.isEmpty(state.label)) {
state.label = mContext.getString(R.string.quick_settings_bluetooth_label);
@@ -110,10 +111,25 @@
} else {
state.iconId = R.drawable.ic_qs_bluetooth_off;
state.label = mContext.getString(R.string.quick_settings_bluetooth_label);
- stateContentDescription = mContext.getString(R.string.accessibility_desc_off);
+ state.contentDescription = mContext.getString(
+ R.string.accessibility_quick_settings_bluetooth_off);
}
- state.contentDescription = mContext.getString(
- R.string.accessibility_quick_settings_bluetooth, stateContentDescription);
+
+ String bluetoothName = state.label;
+ if (connected) {
+ bluetoothName = state.dualLabelContentDescription = mContext.getString(
+ R.string.accessibility_bluetooth_name, state.label);
+ }
+ state.dualLabelContentDescription = bluetoothName;
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(R.string.accessibility_quick_settings_bluetooth_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_bluetooth_changed_off);
+ }
}
private final BluetoothController.Callback mCallback = new BluetoothController.Callback() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java
deleted file mode 100644
index a308e84..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.qs.tiles;
-
-import android.app.ActivityManagerNative;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Build;
-import android.os.RemoteException;
-import android.provider.Settings.Global;
-import android.view.WindowManager;
-import android.view.WindowManagerGlobal;
-
-import com.android.systemui.R;
-import com.android.systemui.qs.GlobalSetting;
-import com.android.systemui.qs.QSTile;
-
-/** Quick settings tile: Bug report **/
-public class BugreportTile extends QSTile<QSTile.State> {
-
- private final GlobalSetting mSetting;
-
- public BugreportTile(Host host) {
- super(host);
- mSetting = new GlobalSetting(mContext, mHandler, Global.BUGREPORT_IN_POWER_MENU) {
- @Override
- protected void handleValueChanged(int value) {
- handleRefreshState(null);
- }
- };
- }
-
- @Override
- protected State newTileState() {
- return new State();
- }
-
- @Override
- public void setListening(boolean listening) {
- mSetting.setListening(listening);
- }
-
- @Override
- protected void handleClick() {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mHost.collapsePanels();
- mUiHandler.post(mShowDialog);
- }
- });
- }
-
- @Override
- protected void handleUpdateState(State state, Object pushArg) {
- state.visible = mSetting.getValue() != 0;
- state.iconId = R.drawable.ic_qs_bugreport;
- state.label = mContext.getString(
- R.string.bugreport_tile_extended,
- mContext.getString(com.android.internal.R.string.bugreport_title),
- Build.VERSION.RELEASE,
- Build.ID);
- }
-
- private final Runnable mShowDialog = new Runnable() {
- @Override
- public void run() {
- final AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
- builder.setPositiveButton(com.android.internal.R.string.report, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (which == DialogInterface.BUTTON_POSITIVE) {
- // Add a little delay before executing, to give the
- // dialog a chance to go away before it takes a
- // screenshot.
- mHandler.postDelayed(new Runnable() {
- @Override public void run() {
- try {
- ActivityManagerNative.getDefault().requestBugReport();
- } catch (RemoteException e) {
- }
- }
- }, 500);
- }
- }
- });
- builder.setMessage(com.android.internal.R.string.bugreport_message);
- builder.setTitle(com.android.internal.R.string.bugreport_title);
- builder.setCancelable(true);
- final Dialog dialog = builder.create();
- dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
- try {
- WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
- } catch (RemoteException e) {
- }
- dialog.show();
- }
- };
-}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
index 531ac31..6cd0f39 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
@@ -37,8 +37,8 @@
/** Quick settings tile: Cast **/
public class CastTile extends QSTile<QSTile.BooleanState> {
- private static final Intent WIFI_DISPLAY_SETTINGS =
- new Intent(Settings.ACTION_WIFI_DISPLAY_SETTINGS);
+ private static final Intent CAST_SETTINGS =
+ new Intent(Settings.ACTION_CAST_SETTINGS);
private final CastController mController;
private final CastDetailAdapter mDetailAdapter;
@@ -110,6 +110,15 @@
mDetailAdapter.updateItems(devices);
}
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (!mState.value) {
+ // We only announce when it's turned off to avoid vocal overflow.
+ return mContext.getString(R.string.accessibility_casting_turned_off);
+ }
+ return null;
+ }
+
private String getDeviceName(CastDevice device) {
return device.name != null ? device.name
: mContext.getString(R.string.quick_settings_cast_device_default_name);
@@ -144,7 +153,7 @@
@Override
public Intent getSettingsIntent() {
- return WIFI_DISPLAY_SETTINGS;
+ return CAST_SETTINGS;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
index 21254d4..a62bbff 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
@@ -29,6 +29,8 @@
private final SecureSetting mSetting;
private final UsageTracker mUsageTracker;
+ private boolean mListening;
+
public ColorInversionTile(Host host) {
super(host);
@@ -36,18 +38,25 @@
Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED) {
@Override
protected void handleValueChanged(int value) {
- handleRefreshState(value);
mUsageTracker.trackUsage();
+ if (mListening) {
+ handleRefreshState(value);
+ }
}
};
mUsageTracker = new UsageTracker(host.getContext(), ColorInversionTile.class);
+ if (mSetting.getValue() != 0 && !mUsageTracker.isRecentlyUsed()) {
+ mUsageTracker.trackUsage();
+ }
mUsageTracker.setListening(true);
+ mSetting.setListening(true);
}
@Override
protected void handleDestroy() {
super.handleDestroy();
mUsageTracker.setListening(false);
+ mSetting.setListening(false);
}
@Override
@@ -57,7 +66,7 @@
@Override
public void setListening(boolean listening) {
- mSetting.setListening(listening);
+ mListening = listening;
}
@Override
@@ -79,4 +88,15 @@
state.label = mContext.getString(R.string.quick_settings_inversion_label);
state.iconId = enabled ? R.drawable.ic_qs_inversion_on : R.drawable.ic_qs_inversion_off;
}
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(
+ R.string.accessibility_quick_settings_color_inversion_changed_on);
+ } else {
+ return mContext.getString(
+ R.string.accessibility_quick_settings_color_inversion_changed_off);
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
index 3ddf5e3..e6b7f02 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
@@ -94,6 +94,19 @@
state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label);
state.iconId = state.value
? R.drawable.ic_qs_flashlight_on : R.drawable.ic_qs_flashlight_off;
+ int onOrOffId = state.value
+ ? R.string.accessibility_quick_settings_flashlight_on
+ : R.string.accessibility_quick_settings_flashlight_off;
+ state.contentDescription = mContext.getString(onOrOffId);
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(R.string.accessibility_quick_settings_flashlight_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_flashlight_changed_off);
+ }
}
@Override
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 96333a3..9984fca 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -74,6 +74,15 @@
: R.drawable.ic_qs_hotspot_off;
}
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(R.string.accessibility_quick_settings_hotspot_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_hotspot_changed_off);
+ }
+ }
+
private final class Callback implements HotspotController.Callback {
@Override
public void onHotspotChanged(boolean enabled) {
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 c4dd643..7ac6644 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java
@@ -71,14 +71,21 @@
state.iconId = R.drawable.ic_qs_location_on;
state.label = mContext.getString(R.string.quick_settings_location_label);
state.contentDescription = mContext.getString(
- R.string.accessibility_quick_settings_location,
- mContext.getString(R.string.accessibility_desc_on));
+ R.string.accessibility_quick_settings_location_on);
} else {
state.iconId = R.drawable.ic_qs_location_off;
state.label = mContext.getString(R.string.quick_settings_location_label);
state.contentDescription = mContext.getString(
- R.string.accessibility_quick_settings_location,
- mContext.getString(R.string.accessibility_desc_off));
+ R.string.accessibility_quick_settings_location_off);
+ }
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.value) {
+ return mContext.getString(R.string.accessibility_quick_settings_location_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_location_changed_off);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java
index 21cf9ec..ae40a4d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java
@@ -74,6 +74,38 @@
state.label = mContext.getString(R.string.quick_settings_rotation_unlocked_label);
state.icon = res.getDrawable(R.drawable.ic_qs_rotation_unlocked);
}
+ state.contentDescription = getAccessibilityString(
+ R.string.accessibility_rotation_lock_on_portrait,
+ R.string.accessibility_rotation_lock_on_landscape,
+ R.string.accessibility_rotation_lock_off);
+ }
+
+ /**
+ * Get the correct accessibility string based on the state
+ *
+ * @param idWhenPortrait The id which should be used when locked in portrait.
+ * @param idWhenLandscape The id which should be used when locked in landscape.
+ * @param idWhenOff The id which should be used when the rotation lock is off.
+ * @return
+ */
+ private String getAccessibilityString(int idWhenPortrait, int idWhenLandscape, int idWhenOff) {
+ int stringID;
+ if (mState.value) {
+ final boolean portrait = mContext.getResources().getConfiguration().orientation
+ != Configuration.ORIENTATION_LANDSCAPE;
+ stringID = portrait ? idWhenPortrait: idWhenLandscape;
+ } else {
+ stringID = idWhenOff;
+ }
+ return mContext.getString(stringID);
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ return getAccessibilityString(
+ R.string.accessibility_rotation_lock_on_portrait_changed,
+ R.string.accessibility_rotation_lock_on_landscape_changed,
+ R.string.accessibility_rotation_lock_off_changed);
}
private final RotationLockControllerCallback mCallback = new RotationLockControllerCallback() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index 5651d49..b12c6c1 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -40,6 +40,7 @@
private final NetworkController mController;
private final WifiDetailAdapter mDetailAdapter;
+ private final QSTile.SignalState mStateBeforeClick = newTileState();
public WifiTile(Host host) {
super(host);
@@ -80,6 +81,7 @@
@Override
protected void handleClick() {
+ mState.copyTo(mStateBeforeClick);
mController.setWifiEnabled(!mState.enabled);
}
@@ -132,8 +134,26 @@
}
state.contentDescription = mContext.getString(
R.string.accessibility_quick_settings_wifi,
- signalContentDescription,
- state.connected ? state.label : "");
+ signalContentDescription);
+ String wifiName = state.label;
+ if (state.connected) {
+ wifiName = r.getString(R.string.accessibility_wifi_name, state.label);
+ }
+ state.dualLabelContentDescription = wifiName;
+ }
+
+ @Override
+ protected boolean shouldAnnouncementBeDelayed() {
+ return mStateBeforeClick.enabled == mState.enabled;
+ }
+
+ @Override
+ protected String composeChangeAnnouncement() {
+ if (mState.enabled) {
+ return mContext.getString(R.string.accessibility_quick_settings_wifi_changed_on);
+ } else {
+ return mContext.getString(R.string.accessibility_quick_settings_wifi_changed_off);
+ }
}
private static String removeDoubleQuotes(String string) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Constants.java b/packages/SystemUI/src/com/android/systemui/recents/Constants.java
index 3d4d6c4..3709c43 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Constants.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Constants.java
@@ -39,6 +39,8 @@
public static final boolean EnableSearchLayout = true;
// Enables the dynamic shadows behind each task
public static final boolean EnableShadows = true;
+ // Enables the thumbnail alpha on the front-most task
+ public static final boolean EnableThumbnailAlphaOnFrontmost = false;
// This disables the bitmap and icon caches
public static final boolean DisableBackgroundCache = false;
// Enables the simulated task affiliations
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 41e06de..7fafe7a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -385,7 +385,7 @@
// Private API calls to make the shadows look better
try {
Utilities.setShadowProperty("ambientShadowStrength", String.valueOf(35f));
- Utilities.setShadowProperty("ambientRatio", String.valueOf(0.5f));
+ Utilities.setShadowProperty("ambientRatio", String.valueOf(1.5f));
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
index 3f5018d..b7f6451 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -81,6 +81,7 @@
public int taskViewRoundedCornerRadiusPx;
public int taskViewHighlightPx;
public int taskViewAffiliateGroupEnterOffsetPx;
+ public float taskViewThumbnailAlpha;
/** Task bar colors */
public int taskBarViewDefaultBackgroundColor;
@@ -217,6 +218,9 @@
taskViewTranslationZMaxPx = res.getDimensionPixelSize(R.dimen.recents_task_view_z_max);
taskViewAffiliateGroupEnterOffsetPx =
res.getDimensionPixelSize(R.dimen.recents_task_view_affiliate_group_enter_offset);
+ TypedValue thumbnailAlphaValue = new TypedValue();
+ res.getValue(R.dimen.recents_task_view_thumbnail_alpha, thumbnailAlphaValue, true);
+ taskViewThumbnailAlpha = thumbnailAlphaValue.getFloat();
// Task bar colors
taskBarViewDefaultBackgroundColor =
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java b/packages/SystemUI/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java
index 4c0ff48..c87a901 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/ReferenceCountedTrigger.java
@@ -16,6 +16,8 @@
package com.android.systemui.recents.misc;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.content.Context;
import java.util.ArrayList;
@@ -98,10 +100,19 @@
}
}
- /** Convenience method to decrement this trigger as a runnable */
+ /** Convenience method to decrement this trigger as a runnable. */
public Runnable decrementAsRunnable() {
return mDecrementRunnable;
}
+ /** Convenience method to decrement this trigger as a animator listener. */
+ public Animator.AnimatorListener decrementOnAnimationEnd() {
+ return new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ decrement();
+ }
+ };
+ }
/** Returns the current ref count */
public int getCount() {
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 4fd9136..aee558f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -73,6 +73,7 @@
boolean mStackViewsDirty = true;
boolean mAwaitingFirstLayout = true;
boolean mStartEnterAnimationRequestedAfterLayout;
+ boolean mStartEnterAnimationCompleted;
ViewAnimation.TaskViewEnterContext mStartEnterAnimationContext;
int[] mTmpVisibleRange = new int[2];
TaskViewTransform mTmpTransform = new TaskViewTransform();
@@ -394,7 +395,7 @@
// Scroll the view into position (just center it in the curve)
if (scrollToNewPosition) {
- float newScroll = mLayoutAlgorithm.getStackScrollForTaskIndex(t) - 0.5f;
+ float newScroll = mLayoutAlgorithm.getStackScrollForTask(t) - 0.5f;
newScroll = mStackScroller.getBoundedStackScroll(newScroll);
mStackScroller.animateScroll(mStackScroller.getStackScroll(), newScroll, postScrollRunnable);
} else {
@@ -609,6 +610,7 @@
ctx.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
@Override
public void run() {
+ mStartEnterAnimationCompleted = true;
// Start dozing
mUIDozeTrigger.startDozing();
}
@@ -679,8 +681,28 @@
// Notify the callback that we've removed the task and it can clean up after it
mCb.onTaskViewDismissed(removedTask);
+ // Get the stack scroll of the task to anchor to (since we are removing something, the front
+ // most task will be our anchor task)
+ Task anchorTask = null;
+ float prevAnchorTaskScroll = 0;
+ boolean pullStackForward = stack.getTaskCount() > 0;
+ if (pullStackForward) {
+ anchorTask = mStack.getFrontMostTask();
+ prevAnchorTaskScroll = mLayoutAlgorithm.getStackScrollForTask(anchorTask);
+ }
+
// Update the min/max scroll and animate other task views into their new positions
updateMinMaxScroll(true, mConfig.launchedWithAltTab, mConfig.launchedFromHome);
+
+ // Offset the stack by as much as the anchor task would otherwise move back
+ if (pullStackForward) {
+ float anchorTaskScroll = mLayoutAlgorithm.getStackScrollForTask(anchorTask);
+ mStackScroller.setStackScroll(mStackScroller.getStackScroll() + (anchorTaskScroll
+ - prevAnchorTaskScroll));
+ mStackScroller.boundScroll();
+ }
+
+ // Animate all the tasks into place
requestSynchronizeStackViewsWithModel(200);
// Update the new front most task
@@ -814,6 +836,11 @@
tv.setNoUserInteractionState();
}
+ // If we've finished the start animation, then ensure we always enable the focus animations
+ if (mStartEnterAnimationCompleted) {
+ tv.enableFocusAnimations();
+ }
+
// Find the index where this task should be placed in the stack
int insertIndex = -1;
int taskIndex = mStack.indexOfTask(task);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java
index 495d00b..f0bdfa2 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java
@@ -53,7 +53,7 @@
// Log function
static final float XScale = 1.75f; // The large the XScale, the longer the flat area of the curve
- static final float LogBase = 300;
+ static final float LogBase = 3000;
static final int PrecisionSteps = 250;
static float[] xp;
static float[] px;
@@ -84,7 +84,7 @@
left + size, mStackRect.top + size);
// Update the affiliation offsets
- float visibleTaskPct = 0.55f;
+ float visibleTaskPct = 0.5f;
mWithinAffiliationOffset = mConfig.taskBarHeight;
mBetweenAffiliationOffset = (int) (visibleTaskPct * mTaskRect.height());
}
@@ -202,7 +202,7 @@
/**
* Returns the scroll to such task top = 1f;
*/
- float getStackScrollForTaskIndex(Task t) {
+ float getStackScrollForTask(Task t) {
return mTaskProgressMap.get(t.key);
}
@@ -312,4 +312,4 @@
}
return px[xFloorIndex] + pFraction;
}
-}
\ No newline at end of file
+}
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 236229e..e514c90 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -17,17 +17,18 @@
package com.android.systemui.recents.views;
import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.content.Context;
import android.graphics.Color;
+import android.graphics.Outline;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.View;
+import android.view.ViewOutlineProvider;
import android.view.animation.AccelerateInterpolator;
import android.widget.FrameLayout;
import com.android.systemui.R;
@@ -55,9 +56,10 @@
float mTaskProgress;
ObjectAnimator mTaskProgressAnimator;
+ ObjectAnimator mDimAnimator;
float mMaxDimScale;
int mDim;
- AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1.25f);
+ AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f);
PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.MULTIPLY);
Task mTask;
@@ -129,6 +131,14 @@
mHeaderView = (TaskViewHeader) findViewById(R.id.task_view_bar);
mThumbnailView = (TaskViewThumbnail) findViewById(R.id.task_view_thumbnail);
mActionButtonView = findViewById(R.id.lock_to_app_fab);
+ mActionButtonView.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ // Set the outline to match the FAB background
+ outline.setOval(0, 0, mActionButtonView.getWidth(),
+ mActionButtonView.getHeight());
+ }
+ });
if (mFooterView != null) {
mFooterView.setCallbacks(this);
}
@@ -222,6 +232,7 @@
* first layout because the actual animation into recents may take a long time. */
void prepareEnterRecentsAnimation(boolean isTaskViewLaunchTargetTask,
boolean occludesLaunchTarget, int offscreenY) {
+ int initialDim = getDim();
if (mConfig.launchedFromAppWithScreenshot) {
if (isTaskViewLaunchTargetTask) {
mHeaderView.prepareEnterRecentsAnimation();
@@ -240,7 +251,7 @@
// Hide the action button if it exists
mActionButtonView.setAlpha(0f);
// Set the dim to 0 so we can animate it in
- setDim(0);
+ initialDim = 0;
} else if (occludesLaunchTarget) {
// Move the task view off screen (below) so we can animate it in
setTranslationY(offscreenY);
@@ -255,6 +266,10 @@
setScaleX(1f);
setScaleY(1f);
}
+ // Apply the current dim
+ setDim(initialDim);
+ // Prepare the thumbnail view alpha
+ mThumbnailView.prepareEnterRecentsAnimation(isTaskViewLaunchTargetTask);
}
/** Animates this task view as it enters recents */
@@ -340,20 +355,24 @@
// Animate the task bar of the first task view
mHeaderView.startEnterRecentsAnimation(mConfig.taskBarEnterAnimDelay,
mThumbnailView.enableTaskBarClipAsRunnable(mHeaderView));
-
- // Animate the dim into view as well
- ObjectAnimator anim = ObjectAnimator.ofInt(this, "dim", getDimFromTaskProgress());
- anim.setStartDelay(mConfig.taskBarEnterAnimDelay);
- anim.setDuration(mConfig.taskBarEnterAnimDuration);
- anim.setInterpolator(mConfig.fastOutLinearInInterpolator);
- anim.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- // Decrement the post animation trigger
- ctx.postAnimationTrigger.decrement();
- }
- });
- anim.start();
+ // Animate the dim/overlay
+ if (Constants.DebugFlags.App.EnableThumbnailAlphaOnFrontmost) {
+ // Animate the thumbnail alpha before the dim animation (to prevent updating the
+ // hardware layer)
+ mThumbnailView.startEnterRecentsAnimation(mConfig.taskBarEnterAnimDelay,
+ new Runnable() {
+ @Override
+ public void run() {
+ animateDimToProgress(0, mConfig.taskBarEnterAnimDuration,
+ ctx.postAnimationTrigger.decrementOnAnimationEnd());
+ }
+ });
+ } else {
+ // Immediately start the dim animation
+ animateDimToProgress(mConfig.taskBarEnterAnimDelay,
+ mConfig.taskBarEnterAnimDuration,
+ ctx.postAnimationTrigger.decrementOnAnimationEnd());
+ }
ctx.postAnimationTrigger.increment();
// Animate the footer into view
@@ -459,8 +478,11 @@
void startLaunchTaskAnimation(final Runnable r, boolean isLaunchingTask,
boolean occludesLaunchTarget) {
if (isLaunchingTask) {
- // Disable the thumbnail clip and animate the bar out
- mHeaderView.startLaunchTaskAnimation(mThumbnailView.disableTaskBarClipAsRunnable(), r);
+ // Disable the thumbnail clip and animate the bar out for the window animation out
+ mHeaderView.startLaunchTaskAnimation(mThumbnailView.disableTaskBarClipAsRunnable(), r,
+ mIsFocused);
+ // Animate the thumbnail alpha back into full opacity for the window animation out
+ mThumbnailView.startLaunchTaskAnimation();
// Animate the dim
if (mDim > 0) {
@@ -612,10 +634,18 @@
/** Returns the current dim. */
public void setDim(int dim) {
mDim = dim;
- int inverse = 255 - mDim;
- mDimColorFilter.setColor(Color.argb(0xFF, inverse, inverse, inverse));
- mLayerPaint.setColorFilter(mDimColorFilter);
- setLayerType(LAYER_TYPE_HARDWARE, mLayerPaint);
+ // Defer setting hardware layers if we have not yet measured, or there is no dim to draw
+ if (getMeasuredWidth() > 0 && getMeasuredHeight() > 0) {
+ if (mDimAnimator != null) {
+ mDimAnimator.removeAllListeners();
+ mDimAnimator.cancel();
+ }
+
+ int inverse = 255 - mDim;
+ mDimColorFilter.setColor(Color.argb(0xFF, inverse, inverse, inverse));
+ mLayerPaint.setColorFilter(mDimColorFilter);
+ setLayerType(LAYER_TYPE_HARDWARE, mLayerPaint);
+ }
}
/** Returns the current dim. */
@@ -623,6 +653,21 @@
return mDim;
}
+ /** Animates the dim to the task progress. */
+ void animateDimToProgress(int delay, int duration, Animator.AnimatorListener postAnimRunnable) {
+ // Animate the dim into view as well
+ int toDim = getDimFromTaskProgress();
+ if (toDim != getDim()) {
+ ObjectAnimator anim = ObjectAnimator.ofInt(TaskView.this, "dim", toDim);
+ anim.setStartDelay(delay);
+ anim.setDuration(duration);
+ if (postAnimRunnable != null) {
+ anim.addListener(postAnimRunnable);
+ }
+ anim.start();
+ }
+ }
+
/** Compute the dim as a function of the scale of this view. */
int getDimFromTaskProgress() {
float dim = mMaxDimScale * mDimInterpolator.getInterpolation(1f - mTaskProgress);
@@ -647,6 +692,8 @@
// Focus the header bar
mHeaderView.onTaskViewFocusChanged(true);
}
+ // Update the thumbnail alpha with the focus
+ mThumbnailView.onFocusChanged(true);
// Call the callback
mCb.onTaskViewFocusChanged(this, true);
// Workaround, we don't always want it focusable in touch mode, but we want the first task
@@ -670,6 +717,8 @@
// Un-focus the header bar
mHeaderView.onTaskViewFocusChanged(false);
}
+ // Update the thumbnail alpha with the focus
+ mThumbnailView.onFocusChanged(false);
// Call the callback
mCb.onTaskViewFocusChanged(this, false);
invalidate();
@@ -790,6 +839,10 @@
} else if (v == mHeaderView.mDismissButton) {
dismissTask();
} else {
+ if (v == mActionButtonView) {
+ // Reset the translation of the action button before we animate it out
+ mActionButtonView.setTranslationZ(0f);
+ }
mCb.onTaskViewClicked(tv, tv.getTask(),
(v == mFooterView || v == mActionButtonView));
}
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 4b09549..c7198fe 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -18,7 +18,9 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.ColorStateList;
@@ -59,7 +61,8 @@
ColorDrawable mBackgroundColor;
Drawable mLightDismissDrawable;
Drawable mDarkDismissDrawable;
- ValueAnimator mBackgroundColorAnimator;
+ AnimatorSet mFocusAnimator;
+ ValueAnimator backgroundColorAnimator;
boolean mIsFullscreen;
boolean mCurrentPrimaryColorIsDark;
@@ -117,6 +120,14 @@
@Override
protected void onFinishInflate() {
+ // Set the outline provider
+ setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRect(0, 0, getMeasuredWidth(), getMeasuredHeight());
+ }
+ });
+
// Initialize the icon and description views
mApplicationIcon = (ImageView) findViewById(R.id.application_icon);
mActivityDescription = (TextView) findViewById(R.id.activity_description);
@@ -211,23 +222,29 @@
void startEnterRecentsAnimation(int delay, Runnable postAnimRunnable) {
// Animate the task bar of the first task view
setVisibility(View.VISIBLE);
- setTranslationY(-getMeasuredHeight());
+ setAlpha(0f);
animate()
- .translationY(0)
+ .alpha(1f)
.setStartDelay(delay)
- .setInterpolator(mConfig.fastOutSlowInInterpolator)
+ .setInterpolator(mConfig.linearOutSlowInInterpolator)
.setDuration(mConfig.taskBarEnterAnimDuration)
.withEndAction(postAnimRunnable)
+ .withLayer()
.start();
}
/** Animates this task bar as it exits recents */
- void startLaunchTaskAnimation(Runnable preAnimRunnable, final Runnable postAnimRunnable) {
+ void startLaunchTaskAnimation(Runnable preAnimRunnable, final Runnable postAnimRunnable,
+ boolean isFocused) {
+ if (isFocused) {
+ onTaskViewFocusChanged(false);
+ }
+
// Animate the task bar out of the first task view
animate()
- .translationY(-getMeasuredHeight())
+ .alpha(0f)
.setStartDelay(0)
- .setInterpolator(mConfig.fastOutLinearInInterpolator)
+ .setInterpolator(mConfig.linearOutSlowInInterpolator)
.setDuration(mConfig.taskBarExitAnimDuration)
.withStartAction(preAnimRunnable)
.withEndAction(new Runnable() {
@@ -236,6 +253,7 @@
post(postAnimRunnable);
}
})
+ .withLayer()
.start();
}
@@ -278,10 +296,10 @@
/** Notifies the associated TaskView has been focused. */
void onTaskViewFocusChanged(boolean focused) {
boolean isRunning = false;
- if (mBackgroundColorAnimator != null) {
- isRunning = mBackgroundColorAnimator.isRunning();
- mBackgroundColorAnimator.removeAllUpdateListeners();
- mBackgroundColorAnimator.cancel();
+ if (mFocusAnimator != null) {
+ isRunning = mFocusAnimator.isRunning();
+ mFocusAnimator.removeAllListeners();
+ mFocusAnimator.cancel();
}
if (focused) {
int secondaryColor = getSecondaryColor(mCurrentPrimaryColor, mCurrentPrimaryColorIsDark);
@@ -302,42 +320,54 @@
// Pulse the background color
int currentColor = mBackgroundColor.getColor();
int lightPrimaryColor = getSecondaryColor(mCurrentPrimaryColor, mCurrentPrimaryColorIsDark);
- mBackgroundColorAnimator = ValueAnimator.ofObject(new ArgbEvaluator(), lightPrimaryColor,
- currentColor);
- mBackgroundColorAnimator.addListener(new AnimatorListenerAdapter() {
+ ValueAnimator backgroundColor = ValueAnimator.ofObject(new ArgbEvaluator(),
+ lightPrimaryColor, currentColor);
+ backgroundColor.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
- mBackground.setState(new int[] {});
+ mBackground.setState(new int[]{});
}
});
- mBackgroundColorAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ backgroundColor.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
mBackgroundColor.setColor((Integer) animation.getAnimatedValue());
}
});
- mBackgroundColorAnimator.setRepeatCount(ValueAnimator.INFINITE);
- mBackgroundColorAnimator.setRepeatMode(ValueAnimator.REVERSE);
- mBackgroundColorAnimator.setStartDelay(750);
- mBackgroundColorAnimator.setDuration(750);
- mBackgroundColorAnimator.start();
+ backgroundColor.setRepeatCount(ValueAnimator.INFINITE);
+ backgroundColor.setRepeatMode(ValueAnimator.REVERSE);
+ // Pulse the translation
+ ObjectAnimator translation = ObjectAnimator.ofFloat(this, "translationZ", 15f);
+ translation.setRepeatCount(ValueAnimator.INFINITE);
+ translation.setRepeatMode(ValueAnimator.REVERSE);
+
+ mFocusAnimator = new AnimatorSet();
+ mFocusAnimator.playTogether(backgroundColor, translation);
+ mFocusAnimator.setStartDelay(750);
+ mFocusAnimator.setDuration(750);
+ mFocusAnimator.start();
} else {
if (isRunning) {
// Restore the background color
int currentColor = mBackgroundColor.getColor();
- mBackgroundColorAnimator = ValueAnimator.ofObject(new ArgbEvaluator(), currentColor,
- mCurrentPrimaryColor);
- mBackgroundColorAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ ValueAnimator backgroundColor = ValueAnimator.ofObject(new ArgbEvaluator(),
+ currentColor, mCurrentPrimaryColor);
+ backgroundColor.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
mBackgroundColor.setColor((Integer) animation.getAnimatedValue());
}
});
- mBackgroundColorAnimator.setRepeatCount(0);
- mBackgroundColorAnimator.setDuration(150);
- mBackgroundColorAnimator.start();
+ // Restore the translation
+ ObjectAnimator translation = ObjectAnimator.ofFloat(this, "translationZ", 0f);
+
+ mFocusAnimator = new AnimatorSet();
+ mFocusAnimator.playTogether(backgroundColor, translation);
+ mFocusAnimator.setDuration(150);
+ mFocusAnimator.start();
} else {
mBackground.setState(new int[] {});
+ setTranslationZ(0f);
}
}
}
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 f836aa3..f223bf3 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
@@ -21,12 +21,15 @@
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.View;
+import com.android.systemui.recents.RecentsConfiguration;
import com.android.systemui.recents.model.Task;
/** The task thumbnail view */
public class TaskViewThumbnail extends FixedSizeImageView {
+ RecentsConfiguration mConfig;
+
// Task bar clipping
Rect mClipRect = new Rect();
@@ -44,9 +47,15 @@
public TaskViewThumbnail(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
+ mConfig = RecentsConfiguration.getInstance();
setScaleType(ScaleType.FIT_XY);
}
+ @Override
+ protected void onFinishInflate() {
+ setAlpha(0.9f);
+ }
+
/** Updates the clip rect based on the given task bar. */
void enableTaskBarClip(View taskBar) {
int top = (int) Math.max(0, taskBar.getTranslationY() +
@@ -101,4 +110,51 @@
void unbindFromTask() {
setImageDrawable(null);
}
+
+ /** Handles focus changes. */
+ void onFocusChanged(boolean focused) {
+ if (focused) {
+ if (Float.compare(getAlpha(), 1f) != 0) {
+ startFadeAnimation(1f, 0, 150, null);
+ }
+ } else {
+ if (Float.compare(getAlpha(), mConfig.taskViewThumbnailAlpha) != 0) {
+ startFadeAnimation(mConfig.taskViewThumbnailAlpha, 0, 150, null);
+ }
+ }
+ }
+
+ /** Prepares for the enter recents animation. */
+ void prepareEnterRecentsAnimation(boolean isTaskViewLaunchTargetTask) {
+ if (isTaskViewLaunchTargetTask) {
+ setAlpha(1f);
+ } else {
+ setAlpha(mConfig.taskViewThumbnailAlpha);
+ }
+ }
+
+ /** Animates this task thumbnail as it enters recents */
+ void startEnterRecentsAnimation(int delay, Runnable postAnimRunnable) {
+ startFadeAnimation(mConfig.taskViewThumbnailAlpha, delay,
+ mConfig.taskBarEnterAnimDuration, postAnimRunnable);
+ }
+
+ /** Animates this task thumbnail as it exits recents */
+ void startLaunchTaskAnimation() {
+ startFadeAnimation(1f, 0, mConfig.taskBarExitAnimDuration, null);
+ }
+
+ /** Animates the thumbnail alpha. */
+ void startFadeAnimation(float finalAlpha, int delay, int duration, Runnable postAnimRunnable) {
+ if (postAnimRunnable != null) {
+ animate().withEndAction(postAnimRunnable);
+ }
+ animate()
+ .alpha(finalAlpha)
+ .setStartDelay(delay)
+ .setInterpolator(mConfig.fastOutSlowInInterpolator)
+ .setDuration(duration)
+ .withLayer()
+ .start();
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index d4c8ce3..d9fea47 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -164,7 +164,8 @@
.setContentTitle(r.getString(R.string.screenshot_saving_title))
.setContentText(r.getString(R.string.screenshot_saving_text))
.setSmallIcon(R.drawable.stat_notify_image)
- .setWhen(now);
+ .setWhen(now)
+ .setColor(r.getColor(com.android.internal.R.color.system_notification_accent_color));
mNotificationStyle = new Notification.BigPictureStyle()
.bigPicture(preview);
@@ -177,7 +178,9 @@
.setContentText(r.getString(R.string.screenshot_saving_text))
.setSmallIcon(R.drawable.stat_notify_image)
.setCategory(Notification.CATEGORY_PROGRESS)
- .setWhen(now);
+ .setWhen(now)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationBuilder.setPublicVersion(mPublicNotificationBuilder.build());
@@ -304,7 +307,9 @@
.setContentText(r.getString(R.string.screenshot_saved_text))
.setContentIntent(PendingIntent.getActivity(params.context, 0, launchIntent, 0))
.setWhen(now)
- .setAutoCancel(true);
+ .setAutoCancel(true)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color));;
// Update the text in the public version as well
mPublicNotificationBuilder
@@ -312,7 +317,9 @@
.setContentText(r.getString(R.string.screenshot_saved_text))
.setContentIntent(PendingIntent.getActivity(params.context, 0, launchIntent, 0))
.setWhen(now)
- .setAutoCancel(true);
+ .setAutoCancel(true)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color));
mNotificationBuilder.setPublicVersion(mPublicNotificationBuilder.build());
@@ -717,7 +724,9 @@
.setWhen(System.currentTimeMillis())
.setVisibility(Notification.VISIBILITY_PUBLIC) // ok to show outside lockscreen
.setCategory(Notification.CATEGORY_ERROR)
- .setAutoCancel(true);
+ .setAutoCancel(true)
+ .setColor(context.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
Notification n =
new Notification.BigTextStyle(b)
.bigText(r.getString(R.string.screenshot_failed_text))
diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
index 2113c68..9fbcd7f 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java
@@ -59,6 +59,7 @@
private boolean mAutomatic;
private boolean mListening;
+ private boolean mExternalChange;
public interface BrightnessStateChangeCallback {
public void onBrightnessLevelChanged();
@@ -86,19 +87,24 @@
@Override
public void onChange(boolean selfChange, Uri uri) {
if (selfChange) return;
- if (BRIGHTNESS_MODE_URI.equals(uri)) {
- updateMode();
- updateSlider();
- } else if (BRIGHTNESS_URI.equals(uri) && !mAutomatic) {
- updateSlider();
- } else if (BRIGHTNESS_ADJ_URI.equals(uri) && mAutomatic) {
- updateSlider();
- } else {
- updateMode();
- updateSlider();
- }
- for (BrightnessStateChangeCallback cb : mChangeCallbacks) {
- cb.onBrightnessLevelChanged();
+ try {
+ mExternalChange = true;
+ if (BRIGHTNESS_MODE_URI.equals(uri)) {
+ updateMode();
+ updateSlider();
+ } else if (BRIGHTNESS_URI.equals(uri) && !mAutomatic) {
+ updateSlider();
+ } else if (BRIGHTNESS_ADJ_URI.equals(uri) && mAutomatic) {
+ updateSlider();
+ } else {
+ updateMode();
+ updateSlider();
+ }
+ for (BrightnessStateChangeCallback cb : mChangeCallbacks) {
+ cb.onBrightnessLevelChanged();
+ }
+ } finally {
+ mExternalChange = false;
}
}
@@ -191,6 +197,8 @@
@Override
public void onChanged(ToggleSlider view, boolean tracking, boolean automatic, int value) {
updateIcon(mAutomatic);
+ if (mExternalChange) return;
+
if (!mAutomatic) {
final int val = value + mMinimumBacklight;
setBrightness(val);
diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java
index d113139..a1704ff 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java
@@ -40,35 +40,27 @@
super.onCreate(savedInstanceState);
final Window window = getWindow();
- final WindowManager.LayoutParams lp = window.getAttributes();
- // Offset from the top
- lp.y = getResources().getDimensionPixelOffset(R.dimen.volume_panel_top);
- lp.type = WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
- lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
-
- window.setAttributes(lp);
window.setGravity(Gravity.TOP);
window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
window.requestFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.quick_settings_brightness_dialog);
+
+ final ImageView icon = (ImageView) findViewById(R.id.brightness_icon);
+ final ToggleSlider slider = (ToggleSlider) findViewById(R.id.brightness_slider);
+ mBrightnessController = new BrightnessController(this, icon, slider);
}
@Override
protected void onStart() {
super.onStart();
-
- final ImageView icon = (ImageView) findViewById(R.id.brightness_icon);
- final ToggleSlider slider = (ToggleSlider) findViewById(R.id.brightness_slider);
- mBrightnessController = new BrightnessController(this, icon, slider);
mBrightnessController.registerCallbacks();
}
@Override
protected void onStop() {
super.onStop();
-
mBrightnessController.unregisterCallbacks();
}
diff --git a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
index acfeb4f..35b574b 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
@@ -79,8 +79,9 @@
public void setMirror(ToggleSlider toggleSlider) {
mMirror = toggleSlider;
if (mMirror != null) {
- mMirror.mToggle.setChecked(mToggle.isChecked());
- mMirror.mSlider.setProgress(mSlider.getProgress());
+ mMirror.setChecked(mToggle.isChecked());
+ mMirror.setMax(mSlider.getMax());
+ mMirror.setValue(mSlider.getProgress());
}
}
@@ -110,10 +111,16 @@
public void setMax(int max) {
mSlider.setMax(max);
+ if (mMirror != null) {
+ mMirror.setMax(max);
+ }
}
public void setValue(int value) {
mSlider.setProgress(value);
+ if (mMirror != null) {
+ mMirror.setValue(value);
+ }
}
private final OnCheckedChangeListener mCheckListener = new OnCheckedChangeListener() {
@@ -141,7 +148,7 @@
}
if (mMirror != null) {
- mMirror.mSlider.setProgress(progress);
+ mMirror.setValue(progress);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
index 99487ff..ca290e4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
@@ -662,7 +662,6 @@
}
public void reset() {
- super.reset();
setTintColor(0);
setShowingLegacyBackground(false);
setBelowSpeedBump(false);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index c23a4cd..53bdcbf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -42,6 +42,7 @@
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
@@ -89,6 +90,7 @@
import com.android.systemui.SystemUI;
import com.android.systemui.statusbar.NotificationData.Entry;
import com.android.systemui.statusbar.phone.KeyguardTouchDelegate;
+import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
@@ -130,9 +132,6 @@
public static final int EXPANDED_LEAVE_ALONE = -10000;
public static final int EXPANDED_FULL_OPEN = -10001;
- /** If true, delays dismissing the Keyguard until the ActivityManager calls back. */
- protected static final boolean DELAY_DISMISS_TO_ACTIVITY_LAUNCH = false;
-
protected CommandQueue mCommandQueue;
protected IStatusBarService mBarService;
protected H mHandler = createHandler();
@@ -156,6 +155,8 @@
protected int mLayoutDirection = -1; // invalid
private Locale mLocale;
+ private float mFontScale;
+
protected boolean mUseHeadsUp = false;
protected boolean mHeadsUpTicker = false;
protected boolean mDisableNotificationAlerts = false;
@@ -163,6 +164,7 @@
protected DevicePolicyManager mDevicePolicyManager;
protected IDreamManager mDreamManager;
PowerManager mPowerManager;
+ protected StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
protected int mRowMinHeight;
protected int mRowMaxHeight;
@@ -252,27 +254,33 @@
}
final boolean isActivity = pendingIntent.isActivity();
if (isActivity) {
+ final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
dismissKeyguardThenExecute(new OnDismissAction() {
@Override
public boolean onDismiss() {
- try {
- // The intent we are sending is for the application, which
- // won't have permission to immediately start an activity after
- // the user switches to home. We know it is safe to do at this
- // point, so make sure new activity switches are now allowed.
- ActivityManagerNative.getDefault().resumeAppSwitches();
- } catch (RemoteException e) {
+ if (keyguardShowing) {
+ try {
+ ActivityManagerNative.getDefault()
+ .keyguardWaitingForActivityDrawn();
+ // The intent we are sending is for the application, which
+ // won't have permission to immediately start an activity after
+ // the user switches to home. We know it is safe to do at this
+ // point, so make sure new activity switches are now allowed.
+ ActivityManagerNative.getDefault().resumeAppSwitches();
+ } catch (RemoteException e) {
+ }
}
boolean handled = superOnClickHandler(view, pendingIntent, fillInIntent);
+ overrideActivityPendingAppTransition(keyguardShowing);
// close the shade if it was open
if (handled) {
- animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
+ animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
visibilityChanged(false);
}
// Wait for activity start.
- return handled && DELAY_DISMISS_TO_ACTIVITY_LAUNCH;
+ return handled;
}
});
return true;
@@ -419,8 +427,10 @@
mRecents = getComponent(RecentsComponent.class);
mRecents.setCallback(this);
- mLocale = mContext.getResources().getConfiguration().locale;
+ final Configuration currentConfig = mContext.getResources().getConfiguration();
+ mLocale = currentConfig.locale;
mLayoutDirection = TextUtils.getLayoutDirectionFromLocale(mLocale);
+ mFontScale = currentConfig.fontScale;
mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
@@ -447,8 +457,7 @@
setSystemUiVisibility(switches[1], 0xffffffff);
topAppWindowChanged(switches[2] != 0);
// StatusBarManagerService has a back up of IME token and it's restored here.
- setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[7] != 0);
- setHardKeyboardStatus(switches[5] != 0, switches[6] != 0);
+ setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[5] != 0);
// Set up the initial icon state
int N = iconList.size();
@@ -527,7 +536,9 @@
protected void onConfigurationChanged(Configuration newConfig) {
final Locale locale = mContext.getResources().getConfiguration().locale;
final int ld = TextUtils.getLayoutDirectionFromLocale(locale);
- if (! locale.equals(mLocale) || ld != mLayoutDirection) {
+ final float fontScale = newConfig.fontScale;
+
+ if (! locale.equals(mLocale) || ld != mLayoutDirection || fontScale != mFontScale) {
if (DEBUG) {
Log.v(TAG, String.format(
"config changed locale/LD: %s (%d) -> %s (%d)", mLocale, mLayoutDirection,
@@ -1064,7 +1075,7 @@
startAppNotificationSettingsActivity(pkg, appUidF);
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
visibilityChanged(false);
- return DELAY_DISMISS_TO_ACTIVITY_LAUNCH;
+ return true;
}
});
}
@@ -1208,8 +1219,6 @@
row.setClearable(sbn.isClearable());
- row.setDrawingCacheEnabled(true);
-
if (MULTIUSER_DEBUG) {
TextView debug = (TextView) row.findViewById(R.id.debug_info);
if (debug != null) {
@@ -1254,54 +1263,74 @@
}
public void onClick(final View v) {
+ final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
dismissKeyguardThenExecute(new OnDismissAction() {
public boolean onDismiss() {
- try {
- // The intent we are sending is for the application, which
- // won't have permission to immediately start an activity after
- // the user switches to home. We know it is safe to do at this
- // point, so make sure new activity switches are now allowed.
- ActivityManagerNative.getDefault().resumeAppSwitches();
- } catch (RemoteException e) {
+ if (mIsHeadsUp) {
+ mHeadsUpNotificationView.clear();
}
+ AsyncTask.execute(new Runnable() {
+ @Override
+ public void run() {
+ if (keyguardShowing) {
+ try {
+ ActivityManagerNative.getDefault()
+ .keyguardWaitingForActivityDrawn();
+ // The intent we are sending is for the application, which
+ // won't have permission to immediately start an activity after
+ // the user switches to home. We know it is safe to do at this
+ // point, so make sure new activity switches are now allowed.
+ ActivityManagerNative.getDefault().resumeAppSwitches();
+ } catch (RemoteException e) {
+ }
+ }
- boolean sent = false;
- if (mIntent != null) {
- int[] pos = new int[2];
- v.getLocationOnScreen(pos);
- Intent overlay = new Intent();
- overlay.setSourceBounds(new Rect(pos[0], pos[1],
- pos[0] + v.getWidth(), pos[1] + v.getHeight()));
- try {
- mIntent.send(mContext, 0, overlay);
- sent = true;
- } catch (PendingIntent.CanceledException e) {
- // the stack trace isn't very helpful here.
- // Just log the exception message.
- Log.w(TAG, "Sending contentIntent failed: " + e);
- }
- }
+ if (mIntent != null) {
+ try {
+ mIntent.send();
+ } catch (PendingIntent.CanceledException e) {
+ // the stack trace isn't very helpful here.
+ // Just log the exception message.
+ Log.w(TAG, "Sending contentIntent failed: " + e);
- try {
- if (mIsHeadsUp) {
- mHeadsUpNotificationView.clear();
+ // TODO: Dismiss Keyguard.
+ }
+ if (mIntent.isActivity()) {
+ overrideActivityPendingAppTransition(keyguardShowing);
+ }
+ }
+
+ try {
+ mBarService.onNotificationClick(mNotificationKey);
+ } catch (RemoteException ex) {
+ // system process is dead if we're here.
+ }
}
- mBarService.onNotificationClick(mNotificationKey);
- } catch (RemoteException ex) {
- // system process is dead if we're here.
- }
+ });
// close the shade if it was open
- animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE);
+ animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
visibilityChanged(false);
- boolean waitForActivityLaunch = sent && mIntent.isActivity();
- return waitForActivityLaunch && DELAY_DISMISS_TO_ACTIVITY_LAUNCH;
+ return mIntent != null && mIntent.isActivity();
}
});
}
}
+ public void animateCollapsePanels(int flags, boolean force) {
+ }
+
+ public void overrideActivityPendingAppTransition(boolean keyguardShowing) {
+ if (keyguardShowing) {
+ try {
+ mWindowManagerService.overridePendingAppTransition(null, 0, 0, null);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Error overriding app transition: " + e);
+ }
+ }
+ }
+
/**
* The LEDs are turned o)ff when the notification panel is shown, even just a little bit.
* This was added last-minute and is inconsistent with the way the rest of the notifications
@@ -1705,6 +1734,9 @@
: null;
// Reapply the RemoteViews
+ if (entry.row != null) {
+ entry.row.resetHeight();
+ }
contentView.reapply(mContext, entry.expanded, mOnClickHandler);
if (bigContentView != null && entry.getBigContentView() != null) {
bigContentView.reapply(mContext, entry.getBigContentView(),
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 63dd1e3..9db875f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -47,16 +47,15 @@
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_SET_HARD_KEYBOARD_STATUS = 9 << MSG_SHIFT;
- private static final int MSG_TOGGLE_RECENT_APPS = 10 << MSG_SHIFT;
- private static final int MSG_PRELOAD_RECENT_APPS = 11 << MSG_SHIFT;
- private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 12 << MSG_SHIFT;
- private static final int MSG_SET_WINDOW_STATE = 13 << MSG_SHIFT;
- private static final int MSG_SHOW_RECENT_APPS = 14 << MSG_SHIFT;
- private static final int MSG_HIDE_RECENT_APPS = 15 << MSG_SHIFT;
- private static final int MSG_BUZZ_BEEP_BLINKED = 16 << MSG_SHIFT;
- private static final int MSG_NOTIFICATION_LIGHT_OFF = 17 << MSG_SHIFT;
- private static final int MSG_NOTIFICATION_LIGHT_PULSE = 18 << 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;
public static final int FLAG_EXCLUDE_NONE = 0;
public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -87,7 +86,6 @@
public void topAppWindowChanged(boolean visible);
public void setImeWindowStatus(IBinder token, int vis, int backDisposition,
boolean showImeSwitcher);
- public void setHardKeyboardStatus(boolean available, boolean enabled);
public void showRecentApps(boolean triggeredFromAltTab);
public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);
public void toggleRecentApps();
@@ -175,14 +173,6 @@
}
}
- public void setHardKeyboardStatus(boolean available, boolean enabled) {
- synchronized (mList) {
- mHandler.removeMessages(MSG_SET_HARD_KEYBOARD_STATUS);
- mHandler.obtainMessage(MSG_SET_HARD_KEYBOARD_STATUS,
- available ? 1 : 0, enabled ? 1 : 0).sendToTarget();
- }
- }
-
public void showRecentApps(boolean triggeredFromAltTab) {
synchronized (mList) {
mHandler.removeMessages(MSG_SHOW_RECENT_APPS);
@@ -300,9 +290,6 @@
mCallbacks.setImeWindowStatus((IBinder) msg.obj, msg.arg1, msg.arg2,
msg.getData().getBoolean(SHOW_IME_SWITCHER_KEY, false));
break;
- case MSG_SET_HARD_KEYBOARD_STATUS:
- mCallbacks.setHardKeyboardStatus(msg.arg1 != 0, msg.arg2 != 0);
- break;
case MSG_SHOW_RECENT_APPS:
mCallbacks.showRecentApps(msg.arg1 != 0);
break;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index a275572..9ac20a6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -88,9 +88,14 @@
mExpansionDisabled = false;
mPublicLayout.reset();
mPrivateLayout.reset();
+ resetHeight();
+ logExpansionEvent(false, wasExpanded);
+ }
+
+ public void resetHeight() {
mMaxExpandHeight = 0;
mWasReset = true;
- logExpansionEvent(false, wasExpanded);
+ onHeightReset();
}
@Override
@@ -152,6 +157,11 @@
logExpansionEvent(true, wasExpanded);
}
+ public void resetUserExpansion() {
+ mHasUserChangedExpansion = false;
+ mUserExpanded = false;
+ }
+
public boolean isUserLocked() {
return mUserLocked;
}
@@ -173,20 +183,26 @@
* @param expand whether the system wants this notification to be expanded.
*/
public void setSystemExpanded(boolean expand) {
- final boolean wasExpanded = isExpanded();
- mIsSystemExpanded = expand;
- notifyHeightChanged();
- logExpansionEvent(false, wasExpanded);
+ if (expand != mIsSystemExpanded) {
+ final boolean wasExpanded = isExpanded();
+ mIsSystemExpanded = expand;
+ notifyHeightChanged();
+ logExpansionEvent(false, wasExpanded);
+ }
}
/**
* @param expansionDisabled whether to prevent notification expansion
*/
public void setExpansionDisabled(boolean expansionDisabled) {
- final boolean wasExpanded = isExpanded();
- mExpansionDisabled = expansionDisabled;
- logExpansionEvent(false, wasExpanded);
- notifyHeightChanged();
+ if (expansionDisabled != mExpansionDisabled) {
+ final boolean wasExpanded = isExpanded();
+ mExpansionDisabled = expansionDisabled;
+ logExpansionEvent(false, wasExpanded);
+ if (wasExpanded != isExpanded()) {
+ notifyHeightChanged();
+ }
+ }
}
/**
@@ -363,9 +379,8 @@
mPrivateLayout.notifyContentUpdated();
}
- public boolean isShowingLayoutLayouted() {
- NotificationContentView showingLayout = getShowingLayout();
- return showingLayout.getWidth() != 0;
+ public boolean isMaxExpandHeightInitialized() {
+ return mMaxExpandHeight != 0;
}
private NotificationContentView getShowingLayout() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index df64edf..127ff6c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -255,8 +255,10 @@
public void setBelowSpeedBump(boolean below) {
}
- public void reset() {
- mOnHeightChangedListener.onReset(this);
+ public void onHeightReset() {
+ if (mOnHeightChangedListener != null) {
+ mOnHeightChangedListener.onReset(this);
+ }
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index f3aba0e..a030f61 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -66,6 +66,12 @@
}
public void reset() {
+ if (mContractedChild != null) {
+ mContractedChild.animate().cancel();
+ }
+ if (mExpandedChild != null) {
+ mExpandedChild.animate().cancel();
+ }
removeAllViews();
mContractedChild = null;
mExpandedChild = null;
@@ -76,6 +82,7 @@
public void setContractedChild(View child) {
if (mContractedChild != null) {
+ mContractedChild.animate().cancel();
removeView(mContractedChild);
}
sanitizeContractedLayoutParams(child);
@@ -86,6 +93,7 @@
public void setExpandedChild(View child) {
if (mExpandedChild != null) {
+ mExpandedChild.animate().cancel();
removeView(mExpandedChild);
}
addView(child);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarter.java
index 5bc7e5a..23810f9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarter.java
@@ -24,5 +24,5 @@
* Keyguard.
*/
public interface ActivityStarter {
- public void startActivity(Intent intent);
+ public void startActivity(Intent intent, boolean dismissShade);
}
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 152bfdc..32fb567 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
@@ -139,7 +139,7 @@
mOpaque = res.getColor(R.color.system_bar_background_opaque);
mSemiTransparent = res.getColor(R.color.system_bar_background_semi_transparent);
mTransparent = res.getColor(R.color.system_bar_background_transparent);
- mWarning = res.getColor(R.color.system_bar_background_warning);
+ mWarning = res.getColor(com.android.internal.R.color.battery_saver_mode_color);
}
mGradient = res.getDrawable(gradientResourceId);
mInterpolator = new LinearInterpolator();
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 e11f20f..61246b0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -24,15 +24,21 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.os.AsyncTask;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.phone.PhoneManager;
import android.provider.MediaStore;
+import android.telecomm.TelecommManager;
import android.util.AttributeSet;
import android.util.Log;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager;
import android.widget.FrameLayout;
+import android.widget.TextView;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardUpdateMonitor;
@@ -62,7 +68,7 @@
private KeyguardAffordanceView mCameraImageView;
private KeyguardAffordanceView mPhoneImageView;
private KeyguardAffordanceView mLockIcon;
- private View mIndicationText;
+ private TextView mIndicationText;
private ViewGroup mPreviewContainer;
private View mPhonePreview;
@@ -74,23 +80,25 @@
private FlashlightController mFlashlightController;
private PreviewInflater mPreviewInflater;
private KeyguardIndicationController mIndicationController;
- private boolean mFaceUnlockRunning;
+
+ private final TrustDrawable mTrustDrawable;
public KeyguardBottomAreaView(Context context) {
- super(context);
+ this(context, null);
}
public KeyguardBottomAreaView(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
}
public KeyguardBottomAreaView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
+ this(context, attrs, defStyleAttr, 0);
}
public KeyguardBottomAreaView(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
+ mTrustDrawable = new TrustDrawable(mContext);
}
@Override
@@ -101,7 +109,7 @@
mCameraImageView = (KeyguardAffordanceView) findViewById(R.id.camera_button);
mPhoneImageView = (KeyguardAffordanceView) findViewById(R.id.phone_button);
mLockIcon = (KeyguardAffordanceView) findViewById(R.id.lock_icon);
- mIndicationText = findViewById(R.id.keyguard_indication_text);
+ mIndicationText = (TextView) findViewById(R.id.keyguard_indication_text);
watchForCameraPolicyChanges();
watchForAccessibilityChanges();
updateCameraVisibility();
@@ -114,6 +122,24 @@
mPreviewInflater = new PreviewInflater(mContext, new LockPatternUtils(mContext));
inflatePreviews();
mLockIcon.setOnClickListener(this);
+ mLockIcon.setBackground(mTrustDrawable);
+ }
+
+ @Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ int indicationBottomMargin = getResources().getDimensionPixelSize(
+ R.dimen.keyguard_indication_margin_bottom);
+ MarginLayoutParams mlp = (MarginLayoutParams) mIndicationText.getLayoutParams();
+ if (mlp.bottomMargin != indicationBottomMargin) {
+ mlp.bottomMargin = indicationBottomMargin;
+ mIndicationText.setLayoutParams(mlp);
+ }
+
+ // Respect font size setting.
+ mIndicationText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.text_size_small_material));
}
public void setActivityStarter(ActivityStarter activityStarter) {
@@ -221,39 +247,68 @@
!mPreviewInflater.wouldLaunchResolverActivity(intent)) {
mContext.startActivityAsUser(intent, UserHandle.CURRENT);
} else {
- mActivityStarter.startActivity(intent);
+ mActivityStarter.startActivity(intent, false /* dismissShade */);
}
}
public void launchPhone() {
- mActivityStarter.startActivity(PHONE_INTENT);
+ TelecommManager tm = TelecommManager.from(mContext);
+ if (tm.isInAPhoneCall()) {
+ final PhoneManager pm = (PhoneManager) mContext.getSystemService(Context.PHONE_SERVICE);
+ AsyncTask.execute(new Runnable() {
+ @Override
+ public void run() {
+ pm.showCallScreen(false /* showDialpad */);
+ }
+ });
+ } else {
+ mActivityStarter.startActivity(PHONE_INTENT, false /* dismissShade */);
+ }
}
@Override
protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);
+ if (isShown()) {
+ mTrustDrawable.start();
+ } else {
+ mTrustDrawable.stop();
+ }
if (changedView == this && visibility == VISIBLE) {
updateLockIcon();
updateCameraVisibility();
}
}
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ mTrustDrawable.stop();
+ }
+
private void updateLockIcon() {
- if (getVisibility() != VISIBLE) {
+ boolean visible = isShown() && KeyguardUpdateMonitor.getInstance(mContext).isScreenOn();
+ if (visible) {
+ mTrustDrawable.start();
+ } else {
+ mTrustDrawable.stop();
+ }
+ if (!visible) {
return;
}
// TODO: Real icon for facelock.
- int iconRes = mFaceUnlockRunning ? R.drawable.ic_account_circle
+ int iconRes = mUnlockMethodCache.isFaceUnlockRunning() ? R.drawable.ic_account_circle
: mUnlockMethodCache.isMethodInsecure() ? R.drawable.ic_lock_open_24dp
: R.drawable.ic_lock_24dp;
mLockIcon.setImageResource(iconRes);
boolean trustManaged = mUnlockMethodCache.isTrustManaged();
- mLockIcon.setBackgroundResource(trustManaged && !mFaceUnlockRunning
- ? R.drawable.trust_circle : 0);
+ mTrustDrawable.setTrustManaged(trustManaged);
mLockIcon.setClickable(trustManaged);
}
+
+
public KeyguardAffordanceView getPhoneView() {
return mPhoneImageView;
}
@@ -321,8 +376,12 @@
}
@Override
- public void onFaceUnlockStateChanged(boolean running) {
- mFaceUnlockRunning = running;
+ public void onScreenTurnedOn() {
+ updateLockIcon();
+ }
+
+ @Override
+ public void onScreenTurnedOff(int why) {
updateLockIcon();
}
};
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 db42b9d..fc737be 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -98,7 +98,7 @@
public void startPreHideAnimation(Runnable runnable) {
if (mKeyguardView != null) {
mKeyguardView.startDisappearAnimation(runnable);
- } else {
+ } else if (runnable != null) {
runnable.run();
}
}
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 b66c310..650a14f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -18,8 +18,10 @@
import android.animation.LayoutTransition;
import android.content.Context;
+import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewTreeObserver;
import android.view.animation.AnimationUtils;
@@ -28,6 +30,7 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
+import com.android.systemui.BatteryMeterView;
import com.android.systemui.R;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
@@ -43,6 +46,7 @@
private boolean mKeyguardUserSwitcherShowing;
private boolean mBatteryListening;
+ private TextView mCarrierLabel;
private View mSystemIconsSuperContainer;
private MultiUserSwitch mMultiUserSwitch;
private ImageView mMultiUserAvatar;
@@ -65,12 +69,25 @@
mMultiUserSwitch = (MultiUserSwitch) findViewById(R.id.multi_user_switch);
mMultiUserAvatar = (ImageView) findViewById(R.id.multi_user_avatar);
mBatteryLevel = (TextView) findViewById(R.id.battery_level);
+ mCarrierLabel = (TextView) findViewById(R.id.keyguard_carrier_text);
loadDimens();
mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(getContext(),
android.R.interpolator.fast_out_slow_in);
updateUserSwitcher();
}
+ @Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+
+ // Respect font size setting.
+ mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.text_size_small_material));
+ mBatteryLevel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimensionPixelSize(R.dimen.battery_level_text_size));
+ }
+
private void loadDimens() {
mSystemIconsSwitcherHiddenExpandedMargin = getResources().getDimensionPixelSize(
R.dimen.system_icons_switcher_hidden_expanded_margin);
@@ -119,6 +136,7 @@
public void setBatteryController(BatteryController batteryController) {
mBatteryController = batteryController;
+ ((BatteryMeterView) findViewById(R.id.battery)).setBatteryController(batteryController);
}
public void setUserInfoController(UserInfoController 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 47325c8..d7144da 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -21,10 +21,13 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.ContactsContract;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
import android.widget.FrameLayout;
+import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
@@ -36,9 +39,11 @@
private QSPanel mQsPanel;
private KeyguardUserSwitcher mKeyguardUserSwitcher;
private boolean mKeyguardMode;
+ final UserManager mUserManager;
public MultiUserSwitch(Context context, AttributeSet attrs) {
super(context, attrs);
+ mUserManager = UserManager.get(getContext());
}
@Override
@@ -80,6 +85,22 @@
}
@Override
+ public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
+ super.onPopulateAccessibilityEvent(event);
+
+ if (isClickable()) {
+ final UserManager um = UserManager.get(getContext());
+ String text = mContext.getString(um.isUserSwitcherEnabled()
+ ? R.string.accessibility_multi_user_switch_switcher
+ : R.string.accessibility_multi_user_switch_quick_contact);
+ if (!TextUtils.isEmpty(text)) {
+ event.getText().add(text);
+ }
+ }
+
+ }
+
+ @Override
public boolean hasOverlappingRendering() {
return false;
}
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 acdc6bc..9188457 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -24,6 +24,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.util.AttributeSet;
+import android.util.MathUtils;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
@@ -35,7 +36,6 @@
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
-
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.ExpandableView;
@@ -104,7 +104,6 @@
private boolean mQsFullyExpanded;
private boolean mKeyguardShowing;
private boolean mDozing;
- private boolean mKeyguardStatusBarTransparent;
private int mStatusBarState;
private float mInitialHeightOnTouch;
private float mInitialTouchX;
@@ -117,6 +116,7 @@
private int mQsPeekHeight;
private boolean mStackScrollerOverscrolling;
private boolean mQsExpansionFromOverscroll;
+ private float mLastOverscroll;
private boolean mQsExpansionEnabled = true;
private ValueAnimator mQsExpansionAnimator;
private FlingAnimationUtils mFlingAnimationUtils;
@@ -159,6 +159,7 @@
private boolean mShadeEmpty;
private boolean mQsScrimEnabled = true;
+ private boolean mLastAnnouncementWasQuickSettings;
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -273,11 +274,10 @@
requestScrollerTopPaddingUpdate(false /* animate */);
}
} else {
- if (!mStackScrollerOverscrolling) {
- setQsExpansion(mQsMinExpansionHeight);
- }
+ setQsExpansion(mQsMinExpansionHeight + mLastOverscroll);
positionClockAndNotifications();
mNotificationStackScroller.setStackHeight(getExpandedHeight());
+ updateHeader();
}
mNotificationStackScroller.updateIsSmallScreen(
mHeader.getCollapsedHeight() + mQsPeekHeight);
@@ -375,6 +375,7 @@
public void setQsExpansionEnabled(boolean qsExpansionEnabled) {
mQsExpansionEnabled = qsExpansionEnabled;
+ mHeader.setClickable(qsExpansionEnabled);
}
@Override
@@ -414,19 +415,19 @@
}
@Override
- public void fling(float vel, boolean always) {
+ public void fling(float vel, boolean expand) {
GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder();
if (gr != null) {
gr.tag("fling " + ((vel > 0) ? "open" : "closed"), "notifications,v=" + vel);
}
- super.fling(vel, always);
+ super.fling(vel, expand);
}
@Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
- event.getText()
- .add(getContext().getString(R.string.accessibility_desc_notification_shade));
+ event.getText().add(getKeyguardOrLockScreenString());
+ mLastAnnouncementWasQuickSettings = false;
return true;
}
@@ -552,8 +553,8 @@
}
private float getQsExpansionFraction() {
- return (mQsExpansionHeight - mQsMinExpansionHeight)
- / (getTempQsMaxExpansion() - mQsMinExpansionHeight);
+ return Math.min(1f, (mQsExpansionHeight - mQsMinExpansionHeight)
+ / (getTempQsMaxExpansion() - mQsMinExpansionHeight));
}
@Override
@@ -571,7 +572,8 @@
return true;
}
if (event.getActionMasked() == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f
- && mStatusBar.getBarState() != StatusBarState.KEYGUARD && !mQsExpanded) {
+ && mStatusBar.getBarState() != StatusBarState.KEYGUARD && !mQsExpanded
+ && mQsExpansionEnabled) {
// Down in the empty area while fully expanded - go to QS.
mQsTracking = true;
@@ -594,7 +596,8 @@
|| event.getActionMasked() == MotionEvent.ACTION_UP) {
mConflictingQsExpansionGesture = false;
}
- if (event.getActionMasked() == MotionEvent.ACTION_DOWN && mExpandedHeight == 0) {
+ if (event.getActionMasked() == MotionEvent.ACTION_DOWN && mExpandedHeight == 0
+ && mQsExpansionEnabled) {
mTwoFingerQsExpandPossible = true;
}
if (mTwoFingerQsExpandPossible && event.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN
@@ -602,6 +605,10 @@
&& event.getY(event.getActionIndex()) < mStatusBarMinHeight) {
mTwoFingerQsExpand = true;
requestPanelHeightUpdate();
+
+ // Normally, we start listening when the panel is expanded, but here we need to start
+ // earlier so the state is already up to date when dragging down.
+ setListening(true);
}
super.onTouchEvent(event);
return true;
@@ -621,6 +628,11 @@
mInitialHeightOnTouch = mQsExpansionHeight;
mInitialTouchY = event.getX();
mInitialTouchX = event.getY();
+
+ // If we interrupt an expansion gesture here, make sure to update the state correctly.
+ if (mIsExpanding) {
+ onExpandingFinished();
+ }
}
}
@@ -715,17 +727,23 @@
@Override
public void onOverscrollTopChanged(float amount, boolean isRubberbanded) {
cancelAnimation();
+ if (!mQsExpansionEnabled) {
+ amount = 0f;
+ }
float rounded = amount >= 1f ? amount : 0f;
mStackScrollerOverscrolling = rounded != 0f && isRubberbanded;
mQsExpansionFromOverscroll = rounded != 0f;
+ mLastOverscroll = rounded;
updateQsState();
setQsExpansion(mQsMinExpansionHeight + rounded);
}
@Override
public void flingTopOverscroll(float velocity, boolean open) {
+ mLastOverscroll = 0f;
setQsExpansion(mQsExpansionHeight);
- flingSettings(velocity, open, new Runnable() {
+ flingSettings(!mQsExpansionEnabled && open ? 0f : velocity, open && mQsExpansionEnabled,
+ new Runnable() {
@Override
public void run() {
mStackScrollerOverscrolling = false;
@@ -977,6 +995,10 @@
setQsExpanded(true);
} else if (height <= mQsMinExpansionHeight && mQsExpanded) {
setQsExpanded(false);
+ if (mLastAnnouncementWasQuickSettings && !mTracking) {
+ announceForAccessibility(getKeyguardOrLockScreenString());
+ mLastAnnouncementWasQuickSettings = false;
+ }
}
mQsExpansionHeight = height;
mHeader.setExpansion(getHeaderExpansionFraction());
@@ -984,20 +1006,28 @@
requestScrollerTopPaddingUpdate(false /* animate */);
updateNotificationScrim(height);
if (mKeyguardShowing) {
- float alpha = getQsExpansionFraction();
- alpha *= 2;
- alpha = Math.min(1, alpha);
- alpha = 1 - alpha;
- mKeyguardStatusBarTransparent = alpha == 0f;
- updateKeyguardStatusBarVisibility();
- if (!mKeyguardStatusBarTransparent) {
- mKeyguardStatusBar.setAlpha(alpha);
- }
+ updateHeaderKeyguard();
}
if (mStatusBarState == StatusBarState.SHADE && mQsExpanded
&& !mStackScrollerOverscrolling && mQsScrimEnabled) {
mQsNavbarScrim.setAlpha(getQsExpansionFraction());
}
+
+ // Upon initialisation when we are not layouted yet we don't want to announce that we are
+ // fully expanded, hence the != 0.0f check.
+ if (height != 0.0f && mQsFullyExpanded && !mLastAnnouncementWasQuickSettings) {
+ announceForAccessibility(getContext().getString(
+ R.string.accessibility_desc_quick_settings));
+ mLastAnnouncementWasQuickSettings = true;
+ }
+ }
+
+ private String getKeyguardOrLockScreenString() {
+ if (mStatusBarState == StatusBarState.KEYGUARD) {
+ return getContext().getString(R.string.accessibility_desc_lock_screen);
+ } else {
+ return getContext().getString(R.string.accessibility_desc_notification_shade);
+ }
}
private void updateNotificationScrim(float height) {
@@ -1025,7 +1055,9 @@
}
private float calculateQsTopPadding() {
- if (mKeyguardShowing) {
+ // We can only do the smoother transition on Keyguard when we also are not collapsing from a
+ // scrolled quick settings.
+ if (mKeyguardShowing && mScrollYOverride == -1) {
return interpolate(getQsExpansionFraction(),
mNotificationStackScroller.getIntrinsicPadding() - mNotificationTopPadding,
mQsMaxExpansionHeight);
@@ -1081,6 +1113,7 @@
}
return;
}
+ mScrollView.setBlockFlinging(true);
ValueAnimator animator = ValueAnimator.ofFloat(mQsExpansionHeight, target);
mFlingAnimationUtils.apply(animator, mQsExpansionHeight, target, vel);
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@@ -1092,6 +1125,7 @@
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
+ mScrollView.setBlockFlinging(false);
mScrollYOverride = -1;
mQsExpansionAnimator = null;
if (onFinishRunnable != null) {
@@ -1339,27 +1373,25 @@
}
private void updateHeaderKeyguard() {
- float alpha;
+ float alphaNotifications;
if (mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
// When on Keyguard, we hide the header as soon as the top card of the notification
// stack scroller is close enough (collision distance) to the bottom of the header.
- alpha = getNotificationsTopY()
+ alphaNotifications = getNotificationsTopY()
/
- (mQsMinExpansionHeight + mNotificationsHeaderCollideDistance);
-
+ (mKeyguardStatusBar.getHeight() + mNotificationsHeaderCollideDistance);
} else {
// In SHADE_LOCKED, the top card is already really close to the header. Hide it as
// soon as we start translating the stack.
- alpha = getNotificationsTopY() / mQsMinExpansionHeight;
+ alphaNotifications = getNotificationsTopY() / mKeyguardStatusBar.getHeight();
}
- alpha = Math.max(0, Math.min(alpha, 1));
- alpha = (float) Math.pow(alpha, 0.75);
- if (!mQsExpanded) {
- mKeyguardStatusBar.setAlpha(alpha);
- }
- mKeyguardBottomArea.setAlpha(alpha);
+ alphaNotifications = MathUtils.constrain(alphaNotifications, 0, 1);
+ alphaNotifications = (float) Math.pow(alphaNotifications, 0.75);
+ float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);
+ mKeyguardStatusBar.setAlpha(Math.min(alphaNotifications, alphaQsExpansion));
+ mKeyguardBottomArea.setAlpha(Math.min(1 - getQsExpansionFraction(), alphaNotifications));
setQsTranslation(mQsExpansionHeight);
}
@@ -1703,8 +1735,7 @@
}
private void updateKeyguardStatusBarVisibility() {
- mKeyguardStatusBar.setVisibility(mKeyguardShowing && !mKeyguardStatusBarTransparent
- && !mDozing ? VISIBLE : INVISIBLE);
+ mKeyguardStatusBar.setVisibility(mKeyguardShowing && !mDozing ? VISIBLE : INVISIBLE);
}
public void setDozing(boolean dozing) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
index ee6b1a9..53361dc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
@@ -33,6 +33,7 @@
private boolean mHandlingTouchEvent;
private float mLastX;
private float mLastY;
+ private boolean mBlockFlinging;
public ObservableScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -109,6 +110,17 @@
maxOverScrollX, maxOverScrollY, isTouchEvent);
}
+ public void setBlockFlinging(boolean blockFlinging) {
+ mBlockFlinging = blockFlinging;
+ }
+
+ @Override
+ public void fling(int velocityY) {
+ if (!mBlockFlinging) {
+ super.fling(velocityY);
+ }
+ }
+
@Override
protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
index 59f94f2..f74d2f4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
@@ -140,7 +140,7 @@
mPanelHolder.setSelectedPanel(mTouchingPanel);
for (PanelView pv : mPanels) {
if (pv != panel) {
- pv.collapse();
+ pv.collapse(false /* delayed */);
}
}
}
@@ -191,7 +191,7 @@
boolean waiting = false;
for (PanelView pv : mPanels) {
if (animate && !pv.isFullyCollapsed()) {
- pv.collapse();
+ pv.collapse(true /* delayed */);
waiting = true;
} else {
pv.resetViews();
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 469a831..b175fd5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -54,6 +54,11 @@
private float mInitialOffsetOnTouch;
private float mExpandedFraction = 0;
protected float mExpandedHeight = 0;
+ private boolean mPanelClosedOnDown;
+ private boolean mHasLayoutedSinceDown;
+ private float mUpdateFlingVelocity;
+ private boolean mUpdateFlingOnLayout;
+ private boolean mPeekTouching;
private boolean mJustPeeked;
private boolean mClosing;
protected boolean mTracking;
@@ -76,7 +81,6 @@
PanelBar mBar;
- protected int mMaxPanelHeight = -1;
private String mViewName;
private float mInitialTouchY;
private float mInitialTouchX;
@@ -99,6 +103,7 @@
};
protected void onExpandingFinished() {
+ mClosing = false;
mBar.onExpandingFinished();
}
@@ -150,7 +155,7 @@
postOnAnimation(new Runnable() {
@Override
public void run() {
- collapse();
+ collapse(false /* delayed */);
}
});
}
@@ -225,6 +230,10 @@
mInitialOffsetOnTouch = mExpandedHeight;
mTouchSlopExceeded = false;
mJustPeeked = false;
+ mPanelClosedOnDown = mExpandedHeight == 0.0f;
+ mHasLayoutedSinceDown = false;
+ mUpdateFlingOnLayout = false;
+ mPeekTouching = mPanelClosedOnDown;
if (mVelocityTracker == null) {
initVelocityTracker();
}
@@ -315,6 +324,10 @@
boolean expand = flingExpands(vel, vectorVel);
onTrackingStopped(expand);
fling(vel, expand);
+ mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown;
+ if (mUpdateFlingOnLayout) {
+ mUpdateFlingVelocity = vel;
+ }
} else {
boolean expands = onEmptySpaceClick(mInitialTouchX);
onTrackingStopped(expands);
@@ -324,6 +337,7 @@
mVelocityTracker.recycle();
mVelocityTracker = null;
}
+ mPeekTouching = false;
break;
}
return !waitForTouchSlop || mTracking;
@@ -382,6 +396,9 @@
mInitialTouchX = x;
mTouchSlopExceeded = false;
mJustPeeked = false;
+ mPanelClosedOnDown = mExpandedHeight == 0.0f;
+ mHasLayoutedSinceDown = false;
+ mUpdateFlingOnLayout = false;
initVelocityTracker();
trackMovement(event);
break;
@@ -414,6 +431,9 @@
}
}
break;
+ case MotionEvent.ACTION_CANCEL:
+ case MotionEvent.ACTION_UP:
+ break;
}
return false;
}
@@ -443,7 +463,6 @@
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
loadDimens();
- mMaxPanelHeight = -1;
}
/**
@@ -523,27 +542,6 @@
return mViewName;
}
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- if (DEBUG) logf("onMeasure(%d, %d) -> (%d, %d)",
- widthMeasureSpec, heightMeasureSpec, getMeasuredWidth(), getMeasuredHeight());
-
- // Did one of our children change size?
- int newHeight = getMeasuredHeight();
- if (newHeight > mMaxPanelHeight) {
- // we only adapt the max height if it's bigger
- mMaxPanelHeight = newHeight;
- // If the user isn't actively poking us, let's rubberband to the content
- if (!mTracking && mHeightAnimator == null
- && mExpandedHeight > 0 && mExpandedHeight != mMaxPanelHeight
- && mMaxPanelHeight > 0 && mPeekAnimator == null) {
- mExpandedHeight = mMaxPanelHeight;
- }
- }
- }
-
public void setExpandedHeight(float height) {
if (DEBUG) logf("setExpandedHeight(%.1f)", height);
setExpandedHeightInternal(height + getOverExpansionPixels());
@@ -551,10 +549,14 @@
@Override
protected void onLayout (boolean changed, int left, int top, int right, int bottom) {
- if (DEBUG) logf("onLayout: changed=%s, bottom=%d eh=%d fh=%d", changed?"T":"f", bottom,
- (int)mExpandedHeight, mMaxPanelHeight);
super.onLayout(changed, left, top, right, bottom);
requestPanelHeightUpdate();
+ mHasLayoutedSinceDown = true;
+ if (mUpdateFlingOnLayout) {
+ abortAnimations();
+ fling(mUpdateFlingVelocity, true);
+ mUpdateFlingOnLayout = false;
+ }
}
protected void requestPanelHeightUpdate() {
@@ -566,7 +568,8 @@
&& mExpandedHeight > 0
&& currentMaxPanelHeight != mExpandedHeight
&& !mPeekPending
- && mPeekAnimator == null) {
+ && mPeekAnimator == null
+ && !mPeekTouching) {
setExpandedHeight(currentMaxPanelHeight);
}
}
@@ -614,10 +617,7 @@
*
* @return the default implementation simply returns the maximum height.
*/
- protected int getMaxPanelHeight() {
- mMaxPanelHeight = Math.max(mMaxPanelHeight, getHeight());
- return mMaxPanelHeight;
- }
+ protected abstract int getMaxPanelHeight();
public void setExpandedFraction(float frac) {
setExpandedHeight(getMaxPanelHeight() * frac);
@@ -651,7 +651,7 @@
mBar = panelBar;
}
- public void collapse() {
+ public void collapse(boolean delayed) {
if (DEBUG) logf("collapse: " + this);
if (mPeekPending || mPeekAnimator != null) {
mCollapseAfterPeek = true;
@@ -668,7 +668,16 @@
}
mClosing = true;
notifyExpandingStarted();
- fling(0, false /* expand */);
+ if (delayed) {
+ postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ fling(0, false /* expand */);
+ }
+ }, 120);
+ } else {
+ fling(0, false /* expand */);
+ }
}
}
@@ -856,7 +865,7 @@
private final Runnable mPostCollapseRunnable = new Runnable() {
@Override
public void run() {
- collapse();
+ collapse(false /* delayed */);
}
};
private boolean onMiddleClicked() {
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 caecf1d..eae64ca 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -91,6 +91,8 @@
import android.view.ViewStub;
import android.view.ViewTreeObserver;
import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.Animation;
@@ -107,13 +109,13 @@
import com.android.internal.statusbar.StatusBarIcon;
import com.android.keyguard.KeyguardHostView.OnDismissAction;
import com.android.keyguard.ViewMediatorCallback;
+import com.android.systemui.BatteryMeterView;
import com.android.systemui.DemoMode;
import com.android.systemui.EventLogTags;
import com.android.systemui.R;
import com.android.systemui.doze.DozeService;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.qs.QSPanel;
-import com.android.systemui.qs.QSTile;
import com.android.systemui.statusbar.ActivatableNotificationView;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.CommandQueue;
@@ -138,6 +140,7 @@
import com.android.systemui.statusbar.policy.FlashlightController;
import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
import com.android.systemui.statusbar.policy.HotspotControllerImpl;
+import com.android.systemui.statusbar.policy.KeyButtonView;
import com.android.systemui.statusbar.policy.KeyguardMonitor;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.policy.LocationControllerImpl;
@@ -211,6 +214,9 @@
public static final int FADE_KEYGUARD_START_DELAY = 100;
public static final int FADE_KEYGUARD_DURATION = 300;
+ /** Allow some time inbetween the long press for back and recents. */
+ private static final int LOCK_TO_APP_GESTURE_TOLERENCE = 200;
+
PhoneStatusBarPolicy mIconPolicy;
// These are no longer handled by the policy, because we need custom strategies for them
@@ -323,7 +329,7 @@
VelocityTracker mVelocityTracker;
int[] mAbsPos = new int[2];
- Runnable mPostCollapseCleanup = null;
+ ArrayList<Runnable> mPostCollapseRunnables = new ArrayList<>();
// for disabling the status bar
int mDisabled = 0;
@@ -356,9 +362,6 @@
if (userSetup != mUserSetup) {
mUserSetup = userSetup;
- if (mNotificationPanel != null) {
- mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned() && userSetup);
- }
if (!mUserSetup && mStatusBarView != null)
animateCollapseQuickSettings();
}
@@ -395,7 +398,6 @@
private int mNavigationBarMode;
private Boolean mScreenOn;
- private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
private ViewMediatorCallback mKeyguardViewMediatorCallback;
private ScrimController mScrimController;
@@ -575,6 +577,7 @@
mDozeServiceHost = new DozeServiceHost();
putComponent(DozeService.Host.class, mDozeServiceHost);
+ putComponent(PhoneStatusBar.class, this);
setControllerUsers();
}
@@ -843,6 +846,8 @@
mUserInfoController.reloadUserInfo();
mHeader.setBatteryController(mBatteryController);
+ ((BatteryMeterView) mStatusBarView.findViewById(R.id.battery)).setBatteryController(
+ mBatteryController);
mKeyguardStatusBar.setBatteryController(mBatteryController);
mHeader.setNextAlarmController(mNextAlarmController);
@@ -887,14 +892,14 @@
return;
}
- mPostCollapseCleanup = new Runnable() {
+ addPostCollapseAction(new Runnable() {
@Override
public void run() {
try {
mBarService.onClearAllNotifications(mCurrentUserId);
} catch (Exception ex) { }
}
- };
+ });
performDismissAllAnimations(viewsToHide);
@@ -1055,10 +1060,13 @@
}
};
- private View.OnLongClickListener mLockToAppClickListener = new View.OnLongClickListener() {
+ private long mLastLockToAppLongPress;
+ private AccessibilityManager mAccessibilityManager;
+ private View.OnLongClickListener mLongPressBackRecentsListener =
+ new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
- toggleLockedApp();
+ handleLongPressBackRecents(v);
return true;
}
};
@@ -1107,7 +1115,9 @@
mNavigationBarView.getRecentsButton().setOnClickListener(mRecentsClickListener);
mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPreloadOnTouchListener);
mNavigationBarView.getRecentsButton().setLongClickable(true);
- mNavigationBarView.getRecentsButton().setOnLongClickListener(mLockToAppClickListener);
+ mNavigationBarView.getRecentsButton().setOnLongClickListener(mLongPressBackRecentsListener);
+ mNavigationBarView.getBackButton().setLongClickable(true);
+ mNavigationBarView.getBackButton().setOnLongClickListener(mLongPressBackRecentsListener);
mNavigationBarView.getHomeButton().setOnTouchListener(mHomeActionListener);
updateSearchPanel();
}
@@ -1339,7 +1349,7 @@
updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
if (CLOSE_PANEL_WHEN_EMPTIED && !hasActiveNotifications()
- && !mNotificationPanel.isTracking()) {
+ && !mNotificationPanel.isTracking() && !mNotificationPanel.isQsExpanded()) {
if (mState == StatusBarState.SHADE) {
animateCollapsePanels();
} else if (mState == StatusBarState.SHADE_LOCKED) {
@@ -1366,6 +1376,17 @@
private void updateNotificationShade() {
if (mStackScroller == null) return;
+ // Do not modify the notifications during collapse.
+ if (isCollapsing()) {
+ addPostCollapseAction(new Runnable() {
+ @Override
+ public void run() {
+ updateNotificationShade();
+ }
+ });
+ return;
+ }
+
ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
ArrayList<ExpandableNotificationRow> toShow = new ArrayList<>(activeNotifications.size());
final int N = activeNotifications.size();
@@ -1437,7 +1458,7 @@
updateClearAll();
updateEmptyShadeView();
- mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned() && mUserSetup);
+ mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned());
mShadeUpdates.check();
}
@@ -2004,8 +2025,8 @@
}
@Override
- public void startActivity(Intent intent) {
- startActivityDismissingKeyguard(intent, false);
+ public void startActivity(Intent intent, boolean dismissShade) {
+ startActivityDismissingKeyguard(intent, false, dismissShade);
}
public ScrimController getScrimController() {
@@ -2016,6 +2037,14 @@
mStatusBarWindowManager.setQsExpanded(expanded);
}
+ public boolean isGoingToNotificationShade() {
+ return mLeaveOpenOnKeyguardHide;
+ }
+
+ public boolean isQsExpanded() {
+ return mNotificationPanel.isQsExpanded();
+ }
+
/**
* All changes to the status bar and notifications funnel through here and are batched.
*/
@@ -2126,10 +2155,7 @@
public void animateCollapsePanels(int flags, boolean force) {
if (!force &&
(mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {
- if (mPostCollapseCleanup != null) {
- mPostCollapseCleanup.run();
- mPostCollapseCleanup = null;
- }
+ runPostCollapseRunnables();
return;
}
if (SPEW) {
@@ -2159,6 +2185,14 @@
}
}
+ private void runPostCollapseRunnables() {
+ int size = mPostCollapseRunnables.size();
+ for (int i = 0; i < size; i++) {
+ mPostCollapseRunnables.get(i).run();
+ }
+ mPostCollapseRunnables.clear();
+ }
+
public ViewPropertyAnimator setVisibilityWhenDone(
final ViewPropertyAnimator a, final View v, final int vis) {
a.setListener(new AnimatorListenerAdapter() {
@@ -2270,11 +2304,7 @@
// Close any "App info" popups that might have snuck on-screen
dismissPopups();
- if (mPostCollapseCleanup != null) {
- mPostCollapseCleanup.run();
- mPostCollapseCleanup = null;
- }
-
+ runPostCollapseRunnables();
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
showBouncer();
disable(mDisabledUnmodified, true /* animate */);
@@ -2606,9 +2636,6 @@
}
@Override
- public void setHardKeyboardStatus(boolean available, boolean enabled) {}
-
- @Override
protected void tick(StatusBarNotification n, boolean firstTime) {
if (!mTickerEnabled) return;
@@ -2874,7 +2901,8 @@
}
}
- public void startActivityDismissingKeyguard(final Intent intent, boolean onlyProvisioned) {
+ public void startActivityDismissingKeyguard(final Intent intent, boolean onlyProvisioned,
+ final boolean dismissShade) {
if (onlyProvisioned && !isDeviceProvisioned()) return;
final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
@@ -2884,32 +2912,27 @@
AsyncTask.execute(new Runnable() {
public void run() {
try {
+ if (keyguardShowing) {
+ ActivityManagerNative.getDefault()
+ .keyguardWaitingForActivityDrawn();
+ }
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
mContext.startActivityAsUser(
intent, new UserHandle(UserHandle.USER_CURRENT));
- if (keyguardShowing) {
- mWindowManagerService.overridePendingAppTransition(
- null, 0, 0, null);
- }
+ overrideActivityPendingAppTransition(keyguardShowing);
} catch (RemoteException e) {
}
}
});
- animateCollapsePanels();
-
- return DELAY_DISMISS_TO_ACTIVITY_LAUNCH;
+ if (dismissShade) {
+ animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
+ }
+ return true;
}
});
}
- private View.OnClickListener mClockClickListener = new View.OnClickListener() {
- public void onClick(View v) {
- startActivityDismissingKeyguard(
- new Intent(Intent.ACTION_QUICK_CLOCK), true); // have fun, everyone
- }
- };
-
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
if (DEBUG) Log.v(TAG, "onReceive: " + intent);
@@ -2928,6 +2951,7 @@
notifyHeadsUpScreenOn(false);
finishBarAnimations();
stopNotificationLogging();
+ resetUserExpandedStates();
}
else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOn = true;
@@ -2956,6 +2980,17 @@
}
};
+ private void resetUserExpandedStates() {
+ ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
+ final int notificationCount = activeNotifications.size();
+ for (int i = 0; i < notificationCount; i++) {
+ NotificationData.Entry entry = activeNotifications.get(i);
+ if (entry.row != null) {
+ entry.row.resetUserExpansion();
+ }
+ }
+ }
+
@Override
protected void dismissKeyguardThenExecute(final OnDismissAction action) {
if (mStatusBarKeyguardViewManager.isShowing()) {
@@ -3208,19 +3243,7 @@
}
private void handleStartSettingsActivity(Intent intent, boolean onlyProvisioned) {
- if (onlyProvisioned && !isDeviceProvisioned()) return;
- try {
- // Dismiss the lock screen when Settings starts.
- ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
- } catch (RemoteException e) {
- }
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
- animateCollapsePanels();
- }
-
- public void startSettingsActivity(String action) {
- postStartSettingsActivity(new Intent(action), 0);
+ startActivityDismissingKeyguard(intent, onlyProvisioned, true /* dismissShade */);
}
private static class FastColorDrawable extends Drawable {
@@ -3363,6 +3386,14 @@
}
}
+ public boolean isCollapsing() {
+ return mNotificationPanel.isCollapsing();
+ }
+
+ public void addPostCollapseAction(Runnable r) {
+ mPostCollapseRunnables.add(r);
+ }
+
public boolean isInLaunchTransition() {
return mNotificationPanel.isLaunchTransitionRunning()
|| mNotificationPanel.isLaunchTransitionFinished();
@@ -3603,10 +3634,7 @@
}
public void onTrackingStarted() {
- if (mPostCollapseCleanup != null) {
- mPostCollapseCleanup.run();
- mPostCollapseCleanup = null;
- }
+ runPostCollapseRunnables();
}
public void onUnlockHintStarted() {
@@ -3753,15 +3781,58 @@
mStackScroller.setAnimationsEnabled(true);
}
- public void toggleLockedApp() {
- Log.d(TAG, "Trying to toggle lock-to-app");
+ /**
+ * This handles long-press of both back and recents. They are
+ * handled together to capture them both being long-pressed
+ * at the same time to exit screen pinning (lock task).
+ *
+ * When accessibility mode is on, only a long-press from recents
+ * is required to exit.
+ *
+ * In all other circumstances we try to pass through long-press events
+ * for Back, so that apps can still use it. Which can be from two things.
+ * 1) Not currently in screen pinning (lock task).
+ * 2) Back is long-pressed without recents.
+ */
+ private void handleLongPressBackRecents(View v) {
try {
+ boolean sendBackLongPress = false;
IActivityManager activityManager = ActivityManagerNative.getDefault();
- if (activityManager.isInLockTaskMode()) {
- activityManager.stopLockTaskModeOnCurrent();
+ if (mAccessibilityManager == null) {
+ mAccessibilityManager = (AccessibilityManager)
+ mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
+ }
+ boolean isAccessiblityEnabled = mAccessibilityManager.isEnabled();
+ if (activityManager.isInLockTaskMode() && !isAccessiblityEnabled) {
+ long time = System.currentTimeMillis();
+ // If we recently long-pressed the other button then they were
+ // long-pressed 'together'
+ if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERENCE) {
+ activityManager.stopLockTaskModeOnCurrent();
+ } else if ((v.getId() == R.id.back)
+ && !mNavigationBarView.getRecentsButton().isPressed()) {
+ // If we aren't pressing recents right now then they presses
+ // won't be together, so send the standard long-press action.
+ sendBackLongPress = true;
+ }
+ mLastLockToAppLongPress = time;
+ } else {
+ // If this is back still need to handle sending the long-press event.
+ if (v.getId() == R.id.back) {
+ sendBackLongPress = true;
+ } else if (isAccessiblityEnabled && activityManager.isInLockTaskMode()) {
+ // When in accessibility mode a long press that is recents (not back)
+ // should stop lock task.
+ activityManager.stopLockTaskModeOnCurrent();
+ }
+ }
+ if (sendBackLongPress) {
+ KeyButtonView keyButtonView = (KeyButtonView) v;
+ keyButtonView.sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
+ keyButtonView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
}
} catch (RemoteException e) {
- Log.d(TAG, "Unable to toggle Lock-to-app", e);
+ Log.d(TAG, "Unable to reach activity manager", e);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 0c62fd3..807a37b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -16,14 +16,16 @@
package com.android.systemui.statusbar.phone;
-import android.app.AlarmClockInfo;
+import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.graphics.Outline;
import android.graphics.Rect;
+import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
@@ -54,7 +56,7 @@
private View mSystemIconsSuperContainer;
private View mDateGroup;
private View mClock;
- private View mTime;
+ private TextView mTime;
private View mAmPm;
private MultiUserSwitch mMultiUserSwitch;
private ImageView mMultiUserAvatar;
@@ -67,13 +69,14 @@
private View mQsDetailHeader;
private TextView mQsDetailHeaderTitle;
private Switch mQsDetailHeaderSwitch;
+ private ImageView mQsDetailHeaderProgress;
private View mEmergencyCallsOnly;
private TextView mBatteryLevel;
private TextView mAlarmStatus;
private boolean mShowEmergencyCallsOnly;
private boolean mAlarmShowing;
- private AlarmClockInfo mNextAlarm;
+ private AlarmManager.AlarmClockInfo mNextAlarm;
private int mCollapsedHeight;
private int mExpandedHeight;
@@ -86,6 +89,9 @@
private int mMultiUserSwitchWidthCollapsed;
private int mMultiUserSwitchWidthExpanded;
+ private int mClockCollapsedSize;
+ private int mClockExpandedSize;
+
/**
* In collapsed QS, the clock and avatar are scaled down a bit post-layout to allow for a nice
* transition. These values determine that factor.
@@ -121,7 +127,7 @@
mSystemIconsSuperContainer.setOnClickListener(this);
mDateGroup = findViewById(R.id.date_group);
mClock = findViewById(R.id.clock);
- mTime = findViewById(R.id.time_view);
+ mTime = (TextView) findViewById(R.id.time_view);
mAmPm = findViewById(R.id.am_pm_view);
mMultiUserSwitch = (MultiUserSwitch) findViewById(R.id.multi_user_switch);
mMultiUserAvatar = (ImageView) findViewById(R.id.multi_user_avatar);
@@ -133,6 +139,7 @@
mQsDetailHeader.setAlpha(0);
mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title);
mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle);
+ mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress);
mEmergencyCallsOnly = findViewById(R.id.header_emergency_calls_only);
mBatteryLevel = (TextView) findViewById(R.id.battery_level);
mAlarmStatus = (TextView) findViewById(R.id.alarm_status);
@@ -152,8 +159,6 @@
boolean rtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
mTime.setPivotX(rtl ? mTime.getWidth() : 0);
mTime.setPivotY(mTime.getBaseline());
- mAmPm.setPivotX(rtl ? mAmPm.getWidth() : 0);
- mAmPm.setPivotY(mAmPm.getBaseline());
updateAmPmTranslation();
}
});
@@ -206,9 +211,10 @@
mAvatarCollapsedScaleFactor =
getResources().getDimensionPixelSize(R.dimen.multi_user_avatar_collapsed_size)
/ (float) mMultiUserAvatar.getLayoutParams().width;
- mClockCollapsedScaleFactor =
- (float) getResources().getDimensionPixelSize(R.dimen.qs_time_collapsed_size)
- / (float) getResources().getDimensionPixelSize(R.dimen.qs_time_expanded_size);
+ mClockCollapsedSize = getResources().getDimensionPixelSize(R.dimen.qs_time_collapsed_size);
+ mClockExpandedSize = getResources().getDimensionPixelSize(R.dimen.qs_time_expanded_size);
+ mClockCollapsedScaleFactor = (float) mClockCollapsedSize / (float) mClockExpandedSize;
+
}
public void setActivityStarter(ActivityStarter activityStarter) {
@@ -333,17 +339,14 @@
}
private void updateClockScale() {
- mAmPm.setScaleX(mClockCollapsedScaleFactor);
- mAmPm.setScaleY(mClockCollapsedScaleFactor);
- mTime.setScaleX(getTimeScale());
- mTime.setScaleY(getTimeScale());
+ mTime.setTextSize(TypedValue.COMPLEX_UNIT_PX, mExpanded
+ ? mClockExpandedSize
+ : mClockCollapsedSize);
+ mTime.setScaleX(1f);
+ mTime.setScaleY(1f);
updateAmPmTranslation();
}
- private float getTimeScale() {
- return !mExpanded ? mClockCollapsedScaleFactor : 1f;
- }
-
private void updateAmPmTranslation() {
boolean rtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
mAmPm.setTranslationX((rtl ? 1 : -1) * mTime.getWidth() * (1 - mTime.getScaleX()));
@@ -360,13 +363,13 @@
}
@Override
- public void onNextAlarmChanged(AlarmClockInfo nextAlarm) {
+ public void onNextAlarmChanged(AlarmManager.AlarmClockInfo nextAlarm) {
mNextAlarm = nextAlarm;
if (nextAlarm != null) {
mAlarmStatus.setText(KeyguardStatusView.formatNextAlarm(getContext(), nextAlarm));
}
mAlarmShowing = nextAlarm != null;
- updateVisibilities();
+ updateEverything();
requestCaptureValues();
}
@@ -483,17 +486,19 @@
} else if (v == mAlarmStatus && mNextAlarm != null) {
PendingIntent showIntent = mNextAlarm.getShowIntent();
if (showIntent != null && showIntent.isActivity()) {
- mActivityStarter.startActivity(showIntent.getIntent());
+ mActivityStarter.startActivity(showIntent.getIntent(), true /* dismissShade */);
}
}
}
private void startSettingsActivity() {
- mActivityStarter.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
+ mActivityStarter.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS),
+ true /* dismissShade */);
}
private void startBatteryActivity() {
- mActivityStarter.startActivity(new Intent(Intent.ACTION_POWER_USAGE_SUMMARY));
+ mActivityStarter.startActivity(new Intent(Intent.ACTION_POWER_USAGE_SUMMARY),
+ true /* dismissShade */);
}
public void setQSPanel(QSPanel qsp) {
@@ -510,10 +515,13 @@
}
public void setShowEmergencyCallsOnly(boolean show) {
- mShowEmergencyCallsOnly = show;
- if (mExpanded) {
- updateVisibilities();
- requestCaptureValues();
+ boolean changed = show != mShowEmergencyCallsOnly;
+ if (changed) {
+ mShowEmergencyCallsOnly = show;
+ if (mExpanded) {
+ updateEverything();
+ requestCaptureValues();
+ }
}
}
@@ -524,8 +532,8 @@
}
private void captureLayoutValues(LayoutValues target) {
- target.timeScale = mTime.getScaleX();
- target.clockY = mClock.getTop();
+ target.timeScale = mExpanded ? 1f : mClockCollapsedScaleFactor;
+ target.clockY = mClock.getBottom();
target.dateY = mDateGroup.getTop();
target.emergencyCallsOnlyAlpha = getAlphaForVisibility(mEmergencyCallsOnly);
target.alarmStatusAlpha = getAlphaForVisibility(mAlarmStatus);
@@ -550,7 +558,7 @@
}
private void applyAlpha(View v, float alpha) {
- if (v == null) {
+ if (v == null || v.getVisibility() == View.GONE) {
return;
}
if (alpha == 0f) {
@@ -564,7 +572,7 @@
private void applyLayoutValues(LayoutValues values) {
mTime.setScaleX(values.timeScale);
mTime.setScaleY(values.timeScale);
- mClock.setY(values.clockY);
+ mClock.setY(values.clockY - mClock.getHeight());
mDateGroup.setY(values.dateY);
mAlarmStatus.setY(values.dateY - mAlarmStatus.getPaddingTop());
mMultiUserAvatar.setScaleX(values.avatarScale);
@@ -593,6 +601,10 @@
applyAlpha(mBatteryLevel, values.batteryLevelAlpha);
applyAlpha(mSettingsButton, values.settingsAlpha);
applyAlpha(mSignalCluster, values.signalClusterAlpha);
+ if (!mExpanded) {
+ mTime.setScaleX(1f);
+ mTime.setScaleY(1f);
+ }
updateAmPmTranslation();
}
@@ -649,6 +661,8 @@
}
private final QSPanel.Callback mQsPanelCallback = new QSPanel.Callback() {
+ private boolean mScanState;
+
@Override
public void onToggleStateChanged(final boolean state) {
post(new Runnable() {
@@ -684,13 +698,23 @@
}
private void handleScanStateChanged(boolean state) {
- // TODO - waiting on framework asset
+ if (mScanState == state) return;
+ mScanState = state;
+ final Animatable anim = (Animatable) mQsDetailHeaderProgress.getDrawable();
+ if (state) {
+ mQsDetailHeaderProgress.animate().alpha(1f);
+ anim.start();
+ } else {
+ mQsDetailHeaderProgress.animate().alpha(0f);
+ anim.stop();
+ }
}
private void handleShowingDetail(final QSTile.DetailAdapter detail) {
final boolean showingDetail = detail != null;
transition(mClock, !showingDetail);
transition(mDateGroup, !showingDetail);
+ transition(mAlarmStatus, !showingDetail);
transition(mQsDetailHeader, showingDetail);
if (showingDetail) {
mQsDetailHeaderTitle.setText(detail.getTitle());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 68dd4f9..f427ec4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -188,6 +188,7 @@
@Override
public void run() {
mStatusBarWindowManager.setKeyguardOccluded(true);
+ reset();
}
});
return;
@@ -206,12 +207,13 @@
* Starts the animation before we dismiss Keyguard, i.e. an disappearing animation on the
* security view of the bouncer.
*
- * @param finishRunnable the runnable to be run after the animation finished
+ * @param finishRunnable the runnable to be run after the animation finished, or {@code null} if
+ * no action should be run
*/
public void startPreHideAnimation(Runnable finishRunnable) {
if (mBouncer.isShowing()) {
mBouncer.startPreHideAnimation(finishRunnable);
- } else {
+ } else if (finishRunnable != null) {
finishRunnable.run();
}
}
@@ -362,4 +364,25 @@
public boolean interceptMediaKey(KeyEvent event) {
return mBouncer.interceptMediaKey(event);
}
+
+ public void onActivityDrawn() {
+ if (mPhoneStatusBar.isCollapsing()) {
+ mPhoneStatusBar.addPostCollapseAction(new Runnable() {
+ @Override
+ public void run() {
+ mViewMediatorCallback.readyForKeyguardDone();
+ }
+ });
+ } else {
+ mViewMediatorCallback.readyForKeyguardDone();
+ }
+ }
+
+ public boolean shouldDisableWindowAnimationsForUnlock() {
+ return mPhoneStatusBar.isInLaunchTransition();
+ }
+
+ public boolean isGoingToNotificationShade() {
+ return mPhoneStatusBar.isGoingToNotificationShade();
+ }
}
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 2c5bcb7..e1fd779 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -28,7 +28,6 @@
import android.view.ViewRootImpl;
import android.widget.FrameLayout;
-import com.android.systemui.ExpandHelper;
import com.android.systemui.R;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.DragDownHelper;
@@ -122,6 +121,7 @@
MotionEvent cancellation = MotionEvent.obtain(ev);
cancellation.setAction(MotionEvent.ACTION_CANCEL);
mStackScrollLayout.onInterceptTouchEvent(cancellation);
+ mNotificationPanel.onInterceptTouchEvent(cancellation);
cancellation.recycle();
}
return intercept;
@@ -130,7 +130,7 @@
@Override
public boolean onTouchEvent(MotionEvent ev) {
boolean handled = false;
- if (mService.getBarState() == StatusBarState.KEYGUARD) {
+ if (mService.getBarState() == StatusBarState.KEYGUARD && !mService.isQsExpanded()) {
handled = mDragDownHelper.onTouchEvent(ev);
}
if (!handled) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
new file mode 100644
index 0000000..dcda2c7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.systemui.statusbar.phone;
+
+import com.android.systemui.R;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+
+public class TrustDrawable extends Drawable {
+
+ private static final long ENTERING_FROM_UNSET_START_DELAY = 200;
+ private static final long VISIBLE_DURATION = 1000;
+ private static final long EXIT_DURATION = 500;
+ private static final long ENTER_DURATION = 500;
+
+ private static final int ALPHA_VISIBLE_MIN = 0x26;
+ private static final int ALPHA_VISIBLE_MAX = 0x4c;
+
+ private static final int STATE_UNSET = -1;
+ private static final int STATE_GONE = 0;
+ private static final int STATE_ENTERING = 1;
+ private static final int STATE_VISIBLE = 2;
+ private static final int STATE_EXITING = 3;
+
+ private int mAlpha;
+ private boolean mAnimating;
+
+ private int mCurAlpha;
+ private float mCurInnerRadius;
+ private Animator mCurAnimator;
+ private int mState = STATE_UNSET;
+ private Paint mPaint;
+ private boolean mTrustManaged;
+
+ private final float mInnerRadiusVisibleMin;
+ private final float mInnerRadiusVisibleMax;
+ private final float mInnerRadiusExit;
+ private final float mInnerRadiusEnter;
+ private final float mThickness;
+
+ private final Animator mVisibleAnimator;
+
+ private final Interpolator mLinearOutSlowInInterpolator;
+ private final Interpolator mFastOutSlowInInterpolator;
+ private final Interpolator mAccelerateDecelerateInterpolator;
+
+ public TrustDrawable(Context context) {
+ Resources r = context.getResources();
+ mInnerRadiusVisibleMin = r.getDimension(R.dimen.trust_circle_inner_radius_visible_min);
+ mInnerRadiusVisibleMax = r.getDimension(R.dimen.trust_circle_inner_radius_visible_max);
+ mInnerRadiusExit = r.getDimension(R.dimen.trust_circle_inner_radius_exit);
+ mInnerRadiusEnter = r.getDimension(R.dimen.trust_circle_inner_radius_enter);
+ mThickness = r.getDimension(R.dimen.trust_circle_thickness);
+
+ mCurInnerRadius = mInnerRadiusEnter;
+
+ mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(
+ context, android.R.interpolator.linear_out_slow_in);
+ mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(
+ context, android.R.interpolator.fast_out_slow_in);
+ mAccelerateDecelerateInterpolator = new AccelerateDecelerateInterpolator();
+
+ mVisibleAnimator = makeVisibleAnimator();
+
+ mPaint = new Paint();
+ mPaint.setStyle(Paint.Style.STROKE);
+ mPaint.setColor(Color.WHITE);
+ mPaint.setAntiAlias(true);
+ mPaint.setStrokeWidth(mThickness);
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ int newAlpha = (mCurAlpha * mAlpha) / 256;
+ if (newAlpha == 0) {
+ return;
+ }
+ final Rect r = getBounds();
+ mPaint.setAlpha(newAlpha);
+ canvas.drawCircle(r.exactCenterX(), r.exactCenterY(), mCurInnerRadius, mPaint);
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+ mAlpha = alpha;
+ }
+
+ @Override
+ public int getAlpha() {
+ return mAlpha;
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter cf) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ @Override
+ public int getOpacity() {
+ return PixelFormat.TRANSLUCENT;
+ }
+
+ public void start() {
+ if (!mAnimating) {
+ mAnimating = true;
+ updateState(true);
+ }
+ }
+
+ public void stop() {
+ if (mAnimating) {
+ mAnimating = false;
+ if (mCurAnimator != null) {
+ mCurAnimator.cancel();
+ mCurAnimator = null;
+ }
+ mState = STATE_UNSET;
+ mCurAlpha = 0;
+ mCurInnerRadius = mInnerRadiusEnter;
+ }
+ }
+
+ public void setTrustManaged(boolean trustManaged) {
+ if (trustManaged == mTrustManaged && mState != STATE_UNSET) return;
+ mTrustManaged = trustManaged;
+ if (mAnimating) {
+ updateState(true);
+ }
+ }
+
+ private void updateState(boolean animate) {
+ int nextState = mState;
+ if (mState == STATE_UNSET) {
+ nextState = mTrustManaged ? STATE_ENTERING : STATE_GONE;
+ } else if (mState == STATE_GONE) {
+ if (mTrustManaged) nextState = STATE_ENTERING;
+ } else if (mState == STATE_ENTERING) {
+ if (!mTrustManaged) nextState = STATE_EXITING;
+ } else if (mState == STATE_VISIBLE) {
+ if (!mTrustManaged) nextState = STATE_EXITING;
+ } else if (mState == STATE_EXITING) {
+ if (mTrustManaged) nextState = STATE_ENTERING;
+ }
+ if (!animate) {
+ if (nextState == STATE_ENTERING) nextState = STATE_VISIBLE;
+ if (nextState == STATE_EXITING) nextState = STATE_GONE;
+ }
+
+ if (nextState != mState) {
+ if (mCurAnimator != null) {
+ mCurAnimator.cancel();
+ mCurAnimator = null;
+ }
+
+ if (nextState == STATE_GONE) {
+ mCurAlpha = 0;
+ mCurInnerRadius = mInnerRadiusEnter;
+ } else if (nextState == STATE_ENTERING) {
+ mCurAnimator = makeEnterAnimator(mCurInnerRadius, mCurAlpha);
+ if (mState == STATE_UNSET) {
+ mCurAnimator.setStartDelay(ENTERING_FROM_UNSET_START_DELAY);
+ }
+ } else if (nextState == STATE_VISIBLE) {
+ mCurAlpha = ALPHA_VISIBLE_MAX;
+ mCurInnerRadius = mInnerRadiusVisibleMax;
+ mCurAnimator = mVisibleAnimator;
+ } else if (nextState == STATE_EXITING) {
+ mCurAnimator = makeExitAnimator(mCurInnerRadius, mCurAlpha);
+ }
+
+ mState = nextState;
+ if (mCurAnimator != null) {
+ mCurAnimator.start();
+ } else {
+ invalidateSelf();
+ }
+ }
+ }
+
+ private Animator makeVisibleAnimator() {
+ return makeAnimators(mInnerRadiusVisibleMax, mInnerRadiusVisibleMin,
+ ALPHA_VISIBLE_MAX, ALPHA_VISIBLE_MIN, VISIBLE_DURATION,
+ mAccelerateDecelerateInterpolator,
+ true /* repeating */, false /* stateUpdateListener */);
+ }
+
+ private Animator makeEnterAnimator(float radius, int alpha) {
+ return makeAnimators(radius, mInnerRadiusVisibleMax,
+ alpha, ALPHA_VISIBLE_MAX, ENTER_DURATION, mLinearOutSlowInInterpolator,
+ false /* repeating */, true /* stateUpdateListener */);
+ }
+
+ private Animator makeExitAnimator(float radius, int alpha) {
+ return makeAnimators(radius, mInnerRadiusExit,
+ alpha, 0, EXIT_DURATION, mFastOutSlowInInterpolator,
+ false /* repeating */, true /* stateUpdateListener */);
+ }
+
+ private Animator makeAnimators(float startRadius, float endRadius,
+ int startAlpha, int endAlpha, long duration, Interpolator interpolator,
+ boolean repeating, boolean stateUpdateListener) {
+ ValueAnimator alphaAnimator = configureAnimator(
+ ValueAnimator.ofInt(startAlpha, endAlpha),
+ duration, mAlphaUpdateListener, interpolator, repeating);
+ ValueAnimator sizeAnimator = configureAnimator(
+ ValueAnimator.ofFloat(startRadius, endRadius),
+ duration, mRadiusUpdateListener, interpolator, repeating);
+
+ AnimatorSet set = new AnimatorSet();
+ set.playTogether(alphaAnimator, sizeAnimator);
+ if (stateUpdateListener) {
+ set.addListener(new StateUpdateAnimatorListener());
+ }
+ return set;
+ }
+
+ private ValueAnimator configureAnimator(ValueAnimator animator, long duration,
+ ValueAnimator.AnimatorUpdateListener updateListener, Interpolator interpolator,
+ boolean repeating) {
+ animator.setDuration(duration);
+ animator.addUpdateListener(updateListener);
+ animator.setInterpolator(interpolator);
+ if (repeating) {
+ animator.setRepeatCount(ValueAnimator.INFINITE);
+ animator.setRepeatMode(ValueAnimator.REVERSE);
+ }
+ return animator;
+ }
+
+ private final ValueAnimator.AnimatorUpdateListener mAlphaUpdateListener =
+ new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ mCurAlpha = (int) animation.getAnimatedValue();
+ invalidateSelf();
+ }
+ };
+
+ private final ValueAnimator.AnimatorUpdateListener mRadiusUpdateListener =
+ new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ mCurInnerRadius = (float) animation.getAnimatedValue();
+ invalidateSelf();
+ }
+ };
+
+ private class StateUpdateAnimatorListener extends AnimatorListenerAdapter {
+ boolean mCancelled;
+
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mCancelled = false;
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ mCancelled = true;
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (!mCancelled) {
+ updateState(false);
+ }
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
index 58196f7..e5eef9d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
@@ -38,6 +38,7 @@
private final ArrayList<OnUnlockMethodChangedListener> mListeners = new ArrayList<>();
private boolean mMethodInsecure;
private boolean mTrustManaged;
+ private boolean mFaceUnlockRunning;
private UnlockMethodCache(Context ctx) {
mLockPatternUtils = new LockPatternUtils(ctx);
@@ -73,10 +74,14 @@
boolean methodInsecure = !mLockPatternUtils.isSecure() ||
mKeyguardUpdateMonitor.getUserHasTrust(user);
boolean trustManaged = mKeyguardUpdateMonitor.getUserTrustIsManaged(user);
- boolean changed = methodInsecure != mMethodInsecure || trustManaged != mTrustManaged;
+ boolean faceUnlockRunning = mKeyguardUpdateMonitor.isFaceUnlockRunning(user)
+ && trustManaged;
+ boolean changed = methodInsecure != mMethodInsecure || trustManaged != mTrustManaged
+ || faceUnlockRunning != mFaceUnlockRunning;
if (changed || updateAlways) {
mMethodInsecure = methodInsecure;
mTrustManaged = trustManaged;
+ mFaceUnlockRunning = faceUnlockRunning;
notifyListeners(mMethodInsecure);
}
}
@@ -112,12 +117,21 @@
public void onFingerprintRecognized(int userId) {
updateMethodSecure(false /* updateAlways */);
}
+
+ @Override
+ public void onFaceUnlockStateChanged(boolean running, int userId) {
+ updateMethodSecure(false /* updateAlways */);
+ }
};
public boolean isTrustManaged() {
return mTrustManaged;
}
+ public boolean isFaceUnlockRunning() {
+ return mFaceUnlockRunning;
+ }
+
public static interface OnUnlockMethodChangedListener {
void onMethodSecureChanged(boolean methodSecure);
}
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 330b599..10f457a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -22,6 +22,7 @@
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.hardware.input.InputManager;
+import android.os.Bundle;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.util.Log;
@@ -33,10 +34,14 @@
import android.view.SoundEffectConstants;
import android.view.ViewConfiguration;
import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.ImageView;
import com.android.systemui.R;
+import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
+import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
+
public class KeyButtonView extends ImageView {
private static final String TAG = "StatusBar.KeyButtonView";
private static final boolean DEBUG = false;
@@ -56,12 +61,12 @@
public void run() {
if (isPressed()) {
// Log.d("KeyButtonView", "longpressed: " + this);
- if (mCode != 0) {
- sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
- sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
- } else {
+ if (isLongClickable()) {
// Just an old-fashioned ImageView
performLongClick();
+ } else {
+ sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
+ sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
}
}
}
@@ -95,6 +100,35 @@
mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
}
+ @Override
+ public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+ super.onInitializeAccessibilityNodeInfo(info);
+ if (mCode != 0) {
+ info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, null));
+ if (mSupportsLongpress) {
+ info.addAction(
+ new AccessibilityNodeInfo.AccessibilityAction(ACTION_LONG_CLICK, null));
+ }
+ }
+ }
+
+ @Override
+ public boolean performAccessibilityAction(int action, Bundle arguments) {
+ if (action == ACTION_CLICK && mCode != 0) {
+ sendEvent(KeyEvent.ACTION_DOWN, 0, SystemClock.uptimeMillis());
+ sendEvent(KeyEvent.ACTION_UP, 0);
+ sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+ playSoundEffect(SoundEffectConstants.CLICK);
+ return true;
+ } else if (action == ACTION_LONG_CLICK && mCode != 0 && mSupportsLongpress) {
+ sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
+ sendEvent(KeyEvent.ACTION_UP, 0);
+ sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
+ return true;
+ }
+ return super.performAccessibilityAction(action, arguments);
+ }
+
public void setQuiescentAlpha(float alpha, boolean animate) {
mAnimateToQuiescent.cancel();
alpha = Math.min(Math.max(alpha, 0), 1);
@@ -216,7 +250,7 @@
return true;
}
- void sendEvent(int action, int flags) {
+ public void sendEvent(int action, int flags) {
sendEvent(action, flags, SystemClock.uptimeMillis());
}
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 4e9f37d..15a7047 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -602,6 +602,8 @@
mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal;
mDataSignalIconId = R.drawable.stat_sys_signal_null;
+ mContentDescriptionPhoneSignal = mContext.getString(
+ AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0]);
} else {
if (mSignalStrength == null) {
if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: mSignalStrength == null");
@@ -665,8 +667,7 @@
mDataIconList = TelephonyIcons.DATA_G[mInetCondition];
mDataTypeIconId = 0;
mQSDataTypeIconId = 0;
- mContentDescriptionDataType = mContext.getString(
- R.string.accessibility_data_connection_gprs);
+ mContentDescriptionDataType = "";
break;
} else {
// fall through
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmController.java
index ca71521..8f1f7c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmController.java
@@ -16,7 +16,6 @@
package com.android.systemui.statusbar.policy;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -33,7 +32,7 @@
private final ArrayList<NextAlarmChangeCallback> mChangeCallbacks = new ArrayList<>();
private AlarmManager mAlarmManager;
- private AlarmClockInfo mNextAlarm;
+ private AlarmManager.AlarmClockInfo mNextAlarm;
public NextAlarmController(Context context) {
mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
@@ -79,6 +78,6 @@
}
public interface NextAlarmChangeCallback {
- void onNextAlarmChanged(AlarmClockInfo nextAlarm);
+ void onNextAlarmChanged(AlarmManager.AlarmClockInfo nextAlarm);
}
}
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 a1993f7..d53aa47 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -113,6 +113,7 @@
*
* @param forcePictureLoadForId forces the picture of the given user to be reloaded.
*/
+ @SuppressWarnings("unchecked")
private void refreshUsers(int forcePictureLoadForId) {
SparseArray<Bitmap> bitmaps = new SparseArray<>(mUsers.size());
@@ -170,7 +171,7 @@
boolean canCreateGuest = (currentUserCanCreateUsers || anyoneCanCreateUsers)
&& guestRecord == null;
boolean canCreateUser = (currentUserCanCreateUsers || anyoneCanCreateUsers)
- && records.size() < UserManager.getMaxSupportedUsers();
+ && mUserManager.canAddMoreUsers();
boolean createIsRestricted = !addUsersWhenLocked;
if (!mSimpleUserSwitcher) {
@@ -507,9 +508,9 @@
setTitle(R.string.guest_exit_guest_dialog_title);
setMessage(context.getString(R.string.guest_exit_guest_dialog_message));
setButton(DialogInterface.BUTTON_NEGATIVE,
- context.getString(android.R.string.no), this);
+ context.getString(android.R.string.cancel), this);
setButton(DialogInterface.BUTTON_POSITIVE,
- context.getString(android.R.string.yes), this);
+ context.getString(R.string.guest_exit_guest_dialog_remove), this);
setCanceledOnTouchOutside(false);
mGuestId = guestId;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
index 6c4fb7a..7d102ba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
@@ -16,7 +16,6 @@
package com.android.systemui.statusbar.policy;
-import android.net.Uri;
import android.service.notification.Condition;
public interface ZenModeController {
@@ -25,15 +24,15 @@
void setZen(int zen);
int getZen();
void requestConditions(boolean request);
- void setExitConditionId(Uri exitConditionId);
- Uri getExitConditionId();
+ void setExitCondition(Condition exitCondition);
+ Condition getExitCondition();
long getNextAlarm();
void setUserId(int userId);
boolean isZenAvailable();
public static class Callback {
public void onZenChanged(int zen) {}
- public void onExitConditionChanged(Uri exitConditionId) {}
+ public void onExitConditionChanged(Condition exitCondition) {}
public void onConditionsChanged(Condition[] conditions) {}
public void onNextAlarmChanged() {}
public void onZenAvailableChanged(boolean available) {}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
index 9d3dec8..b0c8f26 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
@@ -16,7 +16,6 @@
package com.android.systemui.statusbar.policy;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.app.INotificationManager;
import android.content.BroadcastReceiver;
@@ -123,20 +122,20 @@
}
@Override
- public void setExitConditionId(Uri exitConditionId) {
+ public void setExitCondition(Condition exitCondition) {
try {
- mNoMan.setZenModeCondition(exitConditionId);
+ mNoMan.setZenModeCondition(exitCondition);
} catch (RemoteException e) {
// noop
}
}
@Override
- public Uri getExitConditionId() {
+ public Condition getExitCondition() {
try {
final ZenModeConfig config = mNoMan.getZenModeConfig();
if (config != null) {
- return config.exitConditionId;
+ return config.exitCondition;
}
} catch (RemoteException e) {
// noop
@@ -146,7 +145,7 @@
@Override
public long getNextAlarm() {
- final AlarmClockInfo info = mAlarmManager.getNextAlarmClock(mUserId);
+ final AlarmManager.AlarmClockInfo info = mAlarmManager.getNextAlarmClock(mUserId);
return info != null ? info.getTriggerTime() : 0;
}
@@ -187,10 +186,10 @@
}
private void fireExitConditionChanged() {
- final Uri exitConditionId = getExitConditionId();
- if (DEBUG) Slog.d(TAG, "exitConditionId changed: " + exitConditionId);
+ final Condition exitCondition = getExitCondition();
+ if (DEBUG) Slog.d(TAG, "exitCondition changed: " + exitCondition);
for (Callback cb : mCallbacks) {
- cb.onExitConditionChanged(exitConditionId);
+ cb.onExitConditionChanged(exitCondition);
}
}
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 d25dda1..1469d73 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -211,6 +211,15 @@
public NotificationStackScrollLayout(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
+ int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height);
+ int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height);
+ mExpandHelper = new ExpandHelper(getContext(), this,
+ minHeight, maxHeight);
+ mExpandHelper.setEventSource(this);
+ mExpandHelper.setScrollAdapter(this);
+
+ mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, getContext());
+ mSwipeHelper.setLongPressListener(mLongPressListener);
initView(context);
if (DEBUG) {
setWillNotDraw(false);
@@ -248,10 +257,6 @@
mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
mOverflingDistance = configuration.getScaledOverflingDistance();
- float densityScale = getResources().getDisplayMetrics().density;
- float pagingTouchSlop = ViewConfiguration.get(getContext()).getScaledPagingTouchSlop();
- mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, getContext());
- mSwipeHelper.setLongPressListener(mLongPressListener);
mSidePaddings = context.getResources()
.getDimensionPixelSize(R.dimen.notification_side_padding);
@@ -266,12 +271,6 @@
mPaddingBetweenElementsNormal = context.getResources()
.getDimensionPixelSize(R.dimen.notification_padding);
updatePadding(mAmbientState.isDimmed());
- int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height);
- int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height);
- mExpandHelper = new ExpandHelper(getContext(), this,
- minHeight, maxHeight);
- mExpandHelper.setEventSource(this);
- mExpandHelper.setScrollAdapter(this);
mMinTopOverScrollToEscape = getResources().getDimensionPixelSize(
R.dimen.min_top_overscroll_to_qs);
mNotificationTopPadding = getResources().getDimensionPixelSize(
@@ -281,7 +280,7 @@
}
private void updatePadding(boolean dimmed) {
- mPaddingBetweenElements = dimmed
+ mPaddingBetweenElements = dimmed && mStackScrollAlgorithm.shouldScaleDimmed()
? mPaddingBetweenElementsDimmed
: mPaddingBetweenElementsNormal;
mBottomStackSlowDownHeight = mStackScrollAlgorithm.getBottomStackSlowDownLength();
@@ -1915,6 +1914,7 @@
@Override
public void onReset(ExpandableView view) {
mRequestViewResizeAnimationOnLayout = true;
+ mStackScrollAlgorithm.onReset(view);
}
private void updateScrollPositionOnExpandInBottom(ExpandableView view) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index f984339b3..fe855d9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.stack;
import android.content.Context;
+import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -73,6 +74,7 @@
private int mCollapseSecondCardPadding;
private boolean mIsSmallScreen;
private int mMaxNotificationHeight;
+ private boolean mScaleDimmed;
public StackScrollAlgorithm(Context context) {
initConstants(context);
@@ -80,7 +82,7 @@
}
private void updatePadding(boolean dimmed) {
- mPaddingBetweenElements = dimmed
+ mPaddingBetweenElements = dimmed && mScaleDimmed
? mPaddingBetweenElementsDimmed
: mPaddingBetweenElementsNormal;
mTopStackTotalSize = mTopStackSlowDownLength + mPaddingBetweenElements
@@ -125,8 +127,13 @@
R.dimen.notification_material_rounded_rect_radius);
mCollapseSecondCardPadding = context.getResources().getDimensionPixelSize(
R.dimen.notification_collapse_second_card_padding);
+ mScaleDimmed = context.getResources().getDisplayMetrics().densityDpi
+ >= DisplayMetrics.DENSITY_XXHIGH;
}
+ public boolean shouldScaleDimmed() {
+ return mScaleDimmed;
+ }
public void getStackScrollState(AmbientState ambientState, StackScrollState resultState) {
// The state of the local variables are saved in an algorithmState to easily subdivide it
@@ -271,7 +278,7 @@
childViewState.dark = dark;
childViewState.hideSensitive = hideSensitive;
boolean isActivatedChild = activatedChild == child;
- childViewState.scale = !dimmed || isActivatedChild
+ childViewState.scale = !mScaleDimmed || !dimmed || isActivatedChild
? 1.0f
: DIMMED_SCALE;
if (dimmed && activatedChild != null) {
@@ -751,39 +758,42 @@
// current height.
mFirstChildMaxHeight = mFirstChildWhileExpanding.getActualHeight();
} else {
-
- // We are expanding the shade, expand it to its full height.
- if (!isMaxSizeInitialized(mFirstChildWhileExpanding)) {
-
- // This child was not layouted yet, wait for a layout pass
- mFirstChildWhileExpanding
- .addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
- @Override
- public void onLayoutChange(View v, int left, int top, int right,
- int bottom, int oldLeft, int oldTop, int oldRight,
- int oldBottom) {
- if (mFirstChildWhileExpanding != null) {
- mFirstChildMaxHeight = getMaxAllowedChildHeight(
- mFirstChildWhileExpanding);
- } else {
- mFirstChildMaxHeight = 0;
- }
- v.removeOnLayoutChangeListener(this);
- }
- });
- } else {
- mFirstChildMaxHeight = getMaxAllowedChildHeight(mFirstChildWhileExpanding);
- }
+ updateFirstChildMaxSizeToMaxHeight();
}
} else {
mFirstChildMaxHeight = 0;
}
}
+ private void updateFirstChildMaxSizeToMaxHeight() {
+ // We are expanding the shade, expand it to its full height.
+ if (!isMaxSizeInitialized(mFirstChildWhileExpanding)) {
+
+ // This child was not layouted yet, wait for a layout pass
+ mFirstChildWhileExpanding
+ .addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+ @Override
+ public void onLayoutChange(View v, int left, int top, int right,
+ int bottom, int oldLeft, int oldTop, int oldRight,
+ int oldBottom) {
+ if (mFirstChildWhileExpanding != null) {
+ mFirstChildMaxHeight = getMaxAllowedChildHeight(
+ mFirstChildWhileExpanding);
+ } else {
+ mFirstChildMaxHeight = 0;
+ }
+ v.removeOnLayoutChangeListener(this);
+ }
+ });
+ } else {
+ mFirstChildMaxHeight = getMaxAllowedChildHeight(mFirstChildWhileExpanding);
+ }
+ }
+
private boolean isMaxSizeInitialized(ExpandableView child) {
if (child instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
- return row.isShowingLayoutLayouted();
+ return row.isMaxExpandHeightInitialized();
}
return child == null || child.getWidth() != 0;
}
@@ -818,6 +828,12 @@
updatePadding(dimmed);
}
+ public void onReset(ExpandableView view) {
+ if (view.equals(mFirstChildWhileExpanding)) {
+ updateFirstChildMaxSizeToMaxHeight();
+ }
+ }
+
class StackScrollAlgorithmState {
/**
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 049add5..1b6a9e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
@@ -84,10 +84,6 @@
}
@Override
- public void setHardKeyboardStatus(boolean available, boolean enabled) {
- }
-
- @Override
public void toggleRecentApps() {
}
diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
index 481266b..dce5c37 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
@@ -309,7 +309,8 @@
pi = PendingIntent.getBroadcastAsUser(mContext, 0, intent, 0,
UserHandle.CURRENT);
}
-
+ mUsbStorageNotification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
mUsbStorageNotification.setLatestEventInfo(mContext, title, message, pi);
mUsbStorageNotification.visibility = Notification.VISIBILITY_PUBLIC;
mUsbStorageNotification.category = Notification.CATEGORY_SYSTEM;
@@ -403,6 +404,8 @@
}
mMediaStorageNotification.icon = icon;
+ mMediaStorageNotification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
mMediaStorageNotification.setLatestEventInfo(mContext, title, message, pi);
mMediaStorageNotification.visibility = Notification.VISIBILITY_PUBLIC;
mMediaStorageNotification.category = Notification.CATEGORY_SYSTEM;
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index 5233da2..8a14288 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -37,7 +37,7 @@
import android.media.ToneGenerator;
import android.media.VolumeProvider;
import android.media.session.MediaController;
-import android.media.session.MediaController.VolumeInfo;
+import android.media.session.MediaController.PlaybackInfo;
import android.net.Uri;
import android.os.Handler;
import android.os.Message;
@@ -112,7 +112,8 @@
// Pseudo stream type for master volume
private static final int STREAM_MASTER = -100;
- // Pseudo stream type for remote volume is defined in AudioService.STREAM_REMOTE_MUSIC
+ // Pseudo stream type for remote volume
+ private static final int STREAM_REMOTE_MUSIC = -200;
private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -192,7 +193,7 @@
R.drawable.ic_audio_vol,
R.drawable.ic_audio_vol_mute,
false),
- RemoteStream(AudioService.STREAM_REMOTE_MUSIC,
+ RemoteStream(STREAM_REMOTE_MUSIC,
R.string.volume_icon_description_media, //FIXME should have its own description
R.drawable.ic_media_route_on_holo_dark,
R.drawable.ic_media_route_disabled_holo_dark,
@@ -521,7 +522,7 @@
private boolean isMuted(int streamType) {
if (streamType == STREAM_MASTER) {
return mAudioManager.isMasterMute();
- } else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
+ } else if (streamType == STREAM_REMOTE_MUSIC) {
// TODO do we need to support a distinct mute property for remote?
return false;
} else {
@@ -532,12 +533,12 @@
private int getStreamMaxVolume(int streamType) {
if (streamType == STREAM_MASTER) {
return mAudioManager.getMasterMaxVolume();
- } else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
+ } else if (streamType == STREAM_REMOTE_MUSIC) {
if (mStreamControls != null) {
StreamControl sc = mStreamControls.get(streamType);
if (sc != null && sc.controller != null) {
- VolumeInfo vi = sc.controller.getVolumeInfo();
- return vi.getMaxVolume();
+ PlaybackInfo ai = sc.controller.getPlaybackInfo();
+ return ai.getMaxVolume();
}
}
return -1;
@@ -549,12 +550,12 @@
private int getStreamVolume(int streamType) {
if (streamType == STREAM_MASTER) {
return mAudioManager.getMasterVolume();
- } else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
+ } else if (streamType == STREAM_REMOTE_MUSIC) {
if (mStreamControls != null) {
StreamControl sc = mStreamControls.get(streamType);
if (sc != null && sc.controller != null) {
- VolumeInfo vi = sc.controller.getVolumeInfo();
- return vi.getCurrentVolume();
+ PlaybackInfo ai = sc.controller.getPlaybackInfo();
+ return ai.getCurrentVolume();
}
}
return -1;
@@ -564,7 +565,7 @@
}
private void setStreamVolume(StreamControl sc, int index, int flags) {
- if (sc.streamType == AudioService.STREAM_REMOTE_MUSIC) {
+ if (sc.streamType == STREAM_REMOTE_MUSIC) {
if (sc.controller != null) {
sc.controller.setVolumeTo(index, flags);
} else {
@@ -690,7 +691,7 @@
private void updateSliderEnabled(final StreamControl sc, boolean muted, boolean fixedVolume) {
final boolean wasEnabled = sc.seekbarView.isEnabled();
final boolean isRinger = isNotificationOrRing(sc.streamType);
- if (sc.streamType == AudioService.STREAM_REMOTE_MUSIC) {
+ if (sc.streamType == STREAM_REMOTE_MUSIC) {
// never disable touch interactions for remote playback, the muting is not tied to
// the state of the phone.
sc.seekbarView.setEnabled(!fixedVolume);
@@ -805,7 +806,7 @@
public void postRemoteSliderVisibility(boolean visible) {
obtainMessage(MSG_SLIDER_VISIBILITY_CHANGED,
- AudioService.STREAM_REMOTE_MUSIC, visible ? 1 : 0).sendToTarget();
+ STREAM_REMOTE_MUSIC, visible ? 1 : 0).sendToTarget();
}
/**
@@ -980,7 +981,7 @@
break;
}
- case AudioService.STREAM_REMOTE_MUSIC: {
+ case STREAM_REMOTE_MUSIC: {
if (controller == null && sc != null) {
// If we weren't passed one try using the last one set.
controller = sc.controller;
@@ -989,7 +990,7 @@
// We still don't have one, ignore the command.
Log.w(mTag, "sent remote volume change without a controller!");
} else {
- VolumeInfo vi = controller.getVolumeInfo();
+ PlaybackInfo vi = controller.getPlaybackInfo();
index = vi.getCurrentVolume();
max = vi.getMaxVolume();
if ((vi.getVolumeControl() & VolumeProvider.VOLUME_CONTROL_FIXED) != 0) {
@@ -1003,7 +1004,7 @@
}
if (sc != null) {
- if (streamType == AudioService.STREAM_REMOTE_MUSIC && controller != sc.controller) {
+ if (streamType == STREAM_REMOTE_MUSIC && controller != sc.controller) {
if (sc.controller != null) {
sc.controller.removeCallback(mMediaControllerCb);
}
@@ -1021,7 +1022,7 @@
}
if (!isShowing()) {
- int stream = (streamType == AudioService.STREAM_REMOTE_MUSIC) ? -1 : streamType;
+ int stream = (streamType == STREAM_REMOTE_MUSIC) ? -1 : streamType;
// when the stream is for remote playback, use -1 to reset the stream type evaluation
mAudioManager.forceVolumeControlStream(stream);
mDialog.show();
@@ -1031,7 +1032,7 @@
}
// Do a little vibrate if applicable (only when going into vibrate mode)
- if ((streamType != AudioService.STREAM_REMOTE_MUSIC) &&
+ if ((streamType != STREAM_REMOTE_MUSIC) &&
((flags & AudioManager.FLAG_VIBRATE) != 0) &&
mAudioManager.isStreamAffectedByRingerMode(streamType) &&
mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) {
@@ -1094,10 +1095,10 @@
if (((flags & AudioManager.FLAG_SHOW_UI) != 0) || isShowing()) {
synchronized (this) {
- if (mActiveStreamType != AudioService.STREAM_REMOTE_MUSIC) {
- reorderSliders(AudioService.STREAM_REMOTE_MUSIC);
+ if (mActiveStreamType != STREAM_REMOTE_MUSIC) {
+ reorderSliders(STREAM_REMOTE_MUSIC);
}
- onShowVolumeChanged(AudioService.STREAM_REMOTE_MUSIC, flags, controller);
+ onShowVolumeChanged(STREAM_REMOTE_MUSIC, flags, controller);
}
} else {
if (LOGD) Log.d(mTag, "not calling onShowVolumeChanged(), no FLAG_SHOW_UI or no UI");
@@ -1111,9 +1112,9 @@
protected void onRemoteVolumeUpdateIfShown() {
if (LOGD) Log.d(mTag, "onRemoteVolumeUpdateIfShown()");
if (isShowing()
- && (mActiveStreamType == AudioService.STREAM_REMOTE_MUSIC)
+ && (mActiveStreamType == STREAM_REMOTE_MUSIC)
&& (mStreamControls != null)) {
- onShowVolumeChanged(AudioService.STREAM_REMOTE_MUSIC, 0, null);
+ onShowVolumeChanged(STREAM_REMOTE_MUSIC, 0, null);
}
}
@@ -1122,7 +1123,7 @@
*/
private void clearRemoteStreamController() {
if (mStreamControls != null) {
- StreamControl sc = mStreamControls.get(AudioService.STREAM_REMOTE_MUSIC);
+ StreamControl sc = mStreamControls.get(STREAM_REMOTE_MUSIC);
if (sc != null) {
if (sc.controller != null) {
sc.controller.removeCallback(mMediaControllerCb);
@@ -1133,10 +1134,10 @@
}
/**
- * Handler for MSG_SLIDER_VISIBILITY_CHANGED
- * Hide or show a slider
- * @param streamType can be a valid stream type value, or VolumePanel.STREAM_MASTER,
- * or AudioService.STREAM_REMOTE_MUSIC
+ * Handler for MSG_SLIDER_VISIBILITY_CHANGED Hide or show a slider
+ *
+ * @param streamType can be a valid stream type value, or
+ * VolumePanel.STREAM_MASTER, or VolumePanel.STREAM_REMOTE_MUSIC
* @param visible
*/
synchronized protected void onSliderVisibilityChanged(int streamType, int visible) {
@@ -1361,7 +1362,7 @@
};
private final MediaController.Callback mMediaControllerCb = new MediaController.Callback() {
- public void onVolumeInfoChanged(VolumeInfo info) {
+ public void onAudioInfoChanged(PlaybackInfo info) {
onRemoteVolumeUpdateIfShown();
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
index 04a3b88..0586a83 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
@@ -1,6 +1,5 @@
package com.android.systemui.volume;
-import android.app.ActivityManagerNative;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
@@ -18,10 +17,12 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
+import android.view.WindowManagerGlobal;
import com.android.systemui.R;
import com.android.systemui.SystemUI;
import com.android.systemui.keyguard.KeyguardViewMediator;
+import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.statusbar.policy.ZenModeControllerImpl;
@@ -138,22 +139,8 @@
private final Runnable mStartZenSettings = new Runnable() {
@Override
public void run() {
- AsyncTask.execute(new Runnable() {
- @Override
- public void run() {
- try {
- // Dismiss the lock screen when Settings starts.
- ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
- } catch (RemoteException e) {
- }
- final Intent intent = ZenModePanel.ZEN_SETTINGS;
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
-
- // dismiss shade if showing
- mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
- }
- });
+ getComponent(PhoneStatusBar.class).startActivityDismissingKeyguard(
+ ZenModePanel.ZEN_SETTINGS, true /* onlyProvisioned */, true /* dismissShade */);
mPanel.postDismiss(mDismissDelay);
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index 0d837c7..c99e1fd 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -97,14 +97,16 @@
private Callback mCallback;
private ZenModeController mController;
private boolean mRequestingConditions;
- private Uri mExitConditionId;
+ private Condition mExitCondition;
+ private String mExitConditionText;
private int mBucketIndex = -1;
private boolean mExpanded;
private boolean mHidden = false;
private int mSessionZen;
- private Uri mSessionExitConditionId;
- private String mExitConditionText;
+ private Condition mSessionExitCondition;
private long mNextAlarm;
+ private Condition[] mConditions;
+ private Condition mTimeCondition;
public ZenModePanel(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -161,7 +163,7 @@
super.onAttachedToWindow();
if (DEBUG) Log.d(mTag, "onAttachedToWindow");
mSessionZen = getSelectedZen(-1);
- mSessionExitConditionId = mExitConditionId;
+ mSessionExitCondition = copy(mExitCondition);
refreshExitConditionText();
refreshNextAlarm();
updateWidgets();
@@ -172,7 +174,7 @@
super.onDetachedFromWindow();
if (DEBUG) Log.d(mTag, "onDetachedFromWindow");
mSessionZen = -1;
- mSessionExitConditionId = null;
+ mSessionExitCondition = null;
setExpanded(false);
}
@@ -199,17 +201,16 @@
mController.requestConditions(mRequestingConditions);
}
if (mRequestingConditions) {
- Condition timeCondition = parseExistingTimeCondition(mExitConditionId);
- if (timeCondition != null) {
+ mTimeCondition = parseExistingTimeCondition(mExitCondition);
+ if (mTimeCondition != null) {
mBucketIndex = -1;
} else {
mBucketIndex = DEFAULT_BUCKET_INDEX;
- timeCondition = newTimeCondition(MINUTE_BUCKETS[mBucketIndex]);
+ mTimeCondition = newTimeCondition(MINUTE_BUCKETS[mBucketIndex]);
}
if (DEBUG) Log.d(mTag, "Initial bucket index: " + mBucketIndex);
- handleUpdateConditions(new Condition[0]); // ensures forever exists
- bind(timeCondition, mZenConditions.getChildAt(TIME_CONDITION_INDEX));
- checkForDefault();
+ mConditions = null; // reset conditions
+ handleUpdateConditions();
} else {
mZenConditions.removeAllViews();
}
@@ -217,31 +218,47 @@
public void init(ZenModeController controller) {
mController = controller;
- setExitConditionId(mController.getExitConditionId());
+ setExitCondition(mController.getExitCondition());
refreshExitConditionText();
mSessionZen = getSelectedZen(-1);
handleUpdateZen(mController.getZen());
- if (DEBUG) Log.d(mTag, "init mExitConditionId=" + mExitConditionId);
+ if (DEBUG) Log.d(mTag, "init mExitCondition=" + mExitCondition);
mZenConditions.removeAllViews();
mController.addCallback(mZenCallback);
}
- private void setExitConditionId(Uri exitConditionId) {
- if (Objects.equals(mExitConditionId, exitConditionId)) return;
- mExitConditionId = exitConditionId;
+ private void setExitCondition(Condition exitCondition) {
+ if (sameConditionId(mExitCondition, exitCondition)) return;
+ mExitCondition = exitCondition;
refreshExitConditionText();
updateWidgets();
}
+ private Uri getExitConditionId() {
+ return getConditionId(mExitCondition);
+ }
+
+ private static Uri getConditionId(Condition condition) {
+ return condition != null ? condition.id : null;
+ }
+
+ private static boolean sameConditionId(Condition lhs, Condition rhs) {
+ return lhs == null ? rhs == null : rhs != null && lhs.id.equals(rhs.id);
+ }
+
+ private static Condition copy(Condition condition) {
+ return condition == null ? null : condition.copy();
+ }
+
private void refreshExitConditionText() {
final String forever = mContext.getString(R.string.zen_mode_forever);
- if (mExitConditionId == null) {
+ if (mExitCondition == null) {
mExitConditionText = forever;
- } else if (ZenModeConfig.isValidCountdownConditionId(mExitConditionId)) {
- final Condition condition = parseExistingTimeCondition(mExitConditionId);
+ } else if (ZenModeConfig.isValidCountdownConditionId(mExitCondition.id)) {
+ final Condition condition = parseExistingTimeCondition(mExitCondition);
mExitConditionText = condition != null ? condition.summary : forever;
} else {
- mExitConditionText = "(until condition ends)"; // TODO persist current description
+ mExitConditionText = mExitCondition.summary;
}
}
@@ -296,7 +313,7 @@
mZenConditions.setVisibility(!zenOff && expanded ? VISIBLE : GONE);
mAlarmWarning.setVisibility(zenNone && expanded && hasNextAlarm ? VISIBLE : GONE);
if (showAlarmWarning) {
- final long exitTime = ZenModeConfig.tryParseCountdownConditionId(mExitConditionId);
+ final long exitTime = ZenModeConfig.tryParseCountdownConditionId(getExitConditionId());
final long now = System.currentTimeMillis();
final boolean alarmToday = time(mNextAlarm).yearDay == time(now).yearDay;
final String skeleton = (alarmToday ? "" : "E")
@@ -330,8 +347,9 @@
return t;
}
- private Condition parseExistingTimeCondition(Uri conditionId) {
- final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);
+ private Condition parseExistingTimeCondition(Condition condition) {
+ if (condition == null) return null;
+ final long time = ZenModeConfig.tryParseCountdownConditionId(condition.id);
if (time == 0) return null;
final long span = time - System.currentTimeMillis();
if (span <= 0 || span > MAX_BUCKET_MINUTES * MINUTES_MS) return null;
@@ -365,15 +383,36 @@
}
private void handleUpdateConditions(Condition[] conditions) {
- final int newCount = conditions == null ? 0 : conditions.length;
- if (DEBUG) Log.d(mTag, "handleUpdateConditions newCount=" + newCount);
- for (int i = mZenConditions.getChildCount(); i >= newCount + FIRST_CONDITION_INDEX; i--) {
+ mConditions = conditions;
+ handleUpdateConditions();
+ }
+
+ private void handleUpdateConditions() {
+ final int conditionCount = mConditions == null ? 0 : mConditions.length;
+ if (DEBUG) Log.d(mTag, "handleUpdateConditions conditionCount=" + conditionCount);
+ for (int i = mZenConditions.getChildCount() - 1; i >= FIRST_CONDITION_INDEX; i--) {
mZenConditions.removeViewAt(i);
}
+ // forever
bind(null, mZenConditions.getChildAt(FOREVER_CONDITION_INDEX));
- for (int i = 0; i < newCount; i++) {
- bind(conditions[i], mZenConditions.getChildAt(FIRST_CONDITION_INDEX + i));
+ // countdown
+ bind(mTimeCondition, mZenConditions.getChildAt(TIME_CONDITION_INDEX));
+ // provider conditions
+ boolean foundDowntime = false;
+ for (int i = 0; i < conditionCount; i++) {
+ bind(mConditions[i], mZenConditions.getChildAt(FIRST_CONDITION_INDEX + i));
+ foundDowntime |= isDowntime(mConditions[i]);
}
+ // ensure downtime exists, if active
+ if (isDowntime(mSessionExitCondition) && !foundDowntime) {
+ bind(mSessionExitCondition, null);
+ }
+ // ensure something is selected
+ checkForDefault();
+ }
+
+ private static boolean isDowntime(Condition c) {
+ return ZenModeConfig.isValidDowntimeConditionId(getConditionId(c));
}
private ConditionTag getConditionTagAt(int index) {
@@ -385,7 +424,7 @@
for (int i = 0; i < mZenConditions.getChildCount(); i++) {
if (getConditionTagAt(i).rb.isChecked()) {
if (DEBUG) Log.d(mTag, "Not selecting a default, checked="
- + getConditionTagAt(i).conditionId);
+ + getConditionTagAt(i).condition);
return;
}
}
@@ -394,20 +433,20 @@
if (favoriteIndex == -1) {
getConditionTagAt(FOREVER_CONDITION_INDEX).rb.setChecked(true);
} else {
- final Condition c = newTimeCondition(MINUTE_BUCKETS[favoriteIndex]);
+ mTimeCondition = newTimeCondition(MINUTE_BUCKETS[favoriteIndex]);
mBucketIndex = favoriteIndex;
- bind(c, mZenConditions.getChildAt(TIME_CONDITION_INDEX));
+ bind(mTimeCondition, mZenConditions.getChildAt(TIME_CONDITION_INDEX));
getConditionTagAt(TIME_CONDITION_INDEX).rb.setChecked(true);
}
}
- private void handleExitConditionChanged(Uri exitCondition) {
- setExitConditionId(exitCondition);
- if (DEBUG) Log.d(mTag, "handleExitConditionChanged " + mExitConditionId);
+ private void handleExitConditionChanged(Condition exitCondition) {
+ setExitCondition(exitCondition);
+ if (DEBUG) Log.d(mTag, "handleExitConditionChanged " + mExitCondition);
final int N = mZenConditions.getChildCount();
for (int i = 0; i < N; i++) {
final ConditionTag tag = getConditionTagAt(i);
- tag.rb.setChecked(Objects.equals(tag.conditionId, exitCondition));
+ tag.rb.setChecked(sameConditionId(tag.condition, mExitCondition));
}
}
@@ -427,23 +466,23 @@
if (tag.rb == null) {
tag.rb = (RadioButton) row.findViewById(android.R.id.checkbox);
}
- tag.conditionId = condition != null ? condition.id : null;
+ tag.condition = condition;
tag.rb.setEnabled(enabled);
- if (mSessionExitConditionId != null && mSessionExitConditionId.equals(tag.conditionId)) {
+ if (sameConditionId(mSessionExitCondition, tag.condition)) {
tag.rb.setChecked(true);
}
tag.rb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (mExpanded && isChecked) {
- if (DEBUG) Log.d(mTag, "onCheckedChanged " + tag.conditionId);
+ if (DEBUG) Log.d(mTag, "onCheckedChanged " + tag.condition);
final int N = mZenConditions.getChildCount();
for (int i = 0; i < N; i++) {
ConditionTag childTag = getConditionTagAt(i);
if (childTag == tag) continue;
childTag.rb.setChecked(false);
}
- select(tag.conditionId);
+ select(tag.condition);
fireInteraction();
}
}
@@ -479,7 +518,7 @@
}
});
- final long time = ZenModeConfig.tryParseCountdownConditionId(tag.conditionId);
+ final long time = ZenModeConfig.tryParseCountdownConditionId(getConditionId(tag.condition));
if (time > 0) {
if (mBucketIndex > -1) {
button1.setEnabled(mBucketIndex > 0);
@@ -504,7 +543,8 @@
final int N = MINUTE_BUCKETS.length;
if (mBucketIndex == -1) {
// not on a known index, search for the next or prev bucket by time
- final long time = ZenModeConfig.tryParseCountdownConditionId(tag.conditionId);
+ final Uri conditionId = getConditionId(tag.condition);
+ final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);
final long now = System.currentTimeMillis();
for (int i = 0; i < N; i++) {
int j = up ? i : N - 1 - i;
@@ -525,24 +565,25 @@
mBucketIndex = Math.max(0, Math.min(N - 1, mBucketIndex + (up ? 1 : -1)));
newCondition = newTimeCondition(MINUTE_BUCKETS[mBucketIndex]);
}
- bind(newCondition, row);
+ mTimeCondition = newCondition;
+ bind(mTimeCondition, row);
tag.rb.setChecked(true);
- select(newCondition.id);
+ select(mTimeCondition);
fireInteraction();
}
- private void select(Uri conditionId) {
- if (DEBUG) Log.d(mTag, "select " + conditionId);
+ private void select(Condition condition) {
+ if (DEBUG) Log.d(mTag, "select " + condition);
if (mController != null) {
- mController.setExitConditionId(conditionId);
+ mController.setExitCondition(condition);
}
- setExitConditionId(conditionId);
- if (conditionId == null) {
+ setExitCondition(condition);
+ if (condition == null) {
mFavorites.setMinuteIndex(-1);
- } else if (ZenModeConfig.isValidCountdownConditionId(conditionId) && mBucketIndex != -1) {
+ } else if (ZenModeConfig.isValidCountdownConditionId(condition.id) && mBucketIndex != -1) {
mFavorites.setMinuteIndex(mBucketIndex);
}
- mSessionExitConditionId = conditionId;
+ mSessionExitCondition = copy(condition);
}
private void fireMoreSettings() {
@@ -574,8 +615,8 @@
}
@Override
- public void onExitConditionChanged(Uri exitConditionId) {
- mHandler.obtainMessage(H.EXIT_CONDITION_CHANGED, exitConditionId).sendToTarget();
+ public void onExitConditionChanged(Condition exitCondition) {
+ mHandler.obtainMessage(H.EXIT_CONDITION_CHANGED, exitCondition).sendToTarget();
}
@Override
@@ -598,9 +639,8 @@
public void handleMessage(Message msg) {
if (msg.what == UPDATE_CONDITIONS) {
handleUpdateConditions((Condition[]) msg.obj);
- checkForDefault();
} else if (msg.what == EXIT_CONDITION_CHANGED) {
- handleExitConditionChanged((Uri) msg.obj);
+ handleExitConditionChanged((Condition) msg.obj);
} else if (msg.what == UPDATE_ZEN) {
handleUpdateZen(msg.arg1);
} else if (msg.what == NEXT_ALARM_CHANGED) {
@@ -618,7 +658,7 @@
// used as the view tag on condition rows
private static class ConditionTag {
RadioButton rb;
- Uri conditionId;
+ Condition condition;
}
private final class Favorites implements OnSharedPreferenceChangeListener {
diff --git a/packages/VpnDialogs/res/values-in/strings.xml b/packages/VpnDialogs/res/values-in/strings.xml
index 2848f83..1b5d03a 100644
--- a/packages/VpnDialogs/res/values-in/strings.xml
+++ b/packages/VpnDialogs/res/values-in/strings.xml
@@ -26,5 +26,5 @@
<string name="duration" msgid="3584782459928719435">"Durasi:"</string>
<string name="data_transmitted" msgid="7988167672982199061">"Terkirim:"</string>
<string name="data_received" msgid="4062776929376067820">"Diterima:"</string>
- <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> byte / <xliff:g id="NUMBER_1">%2$s</xliff:g> paket"</string>
+ <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> bita / <xliff:g id="NUMBER_1">%2$s</xliff:g> paket"</string>
</resources>
diff --git a/packages/VpnDialogs/res/values-my-rMM/strings.xml b/packages/VpnDialogs/res/values-my-rMM/strings.xml
index b5c0e16..c2aec1d 100644
--- a/packages/VpnDialogs/res/values-my-rMM/strings.xml
+++ b/packages/VpnDialogs/res/values-my-rMM/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="prompt" msgid="8359175999006833462">"<xliff:g id="APP">%s</xliff:g> သည်VPNဆက်သွယ်မှုရရှိရန်ကြိုးစားနေသည်"</string>
- <string name="warning" msgid="5470743576660160079">"ရှေ့ဆက်လုပ်ဆောင်ခြင်းအားဖြင့် အပ်ပလီကေးရှင်းအား ကွန်ယက်အသွားအလာအားကြားဖြတ်စေရန် ခွင့်ပြုခြင်းဖြစ်သည်။"<b>"အပ်ပလီကေးရှင်းအား မယုံကြည်သရွေ့ လက်မခံပါနှင့်"</b>" သို့မဟုတ်လျှင် မလိုလားအပ်သောဆော့ဖ်ဝဲမှ သင့်ဒေတာများအားအပေးအယူလုပ်နိုင်စေရန် ဘေးအန္တရာယ်ရှိပါသည်"</string>
+ <string name="warning" msgid="5470743576660160079">"ရှေ့ဆက်လုပ်ဆောင်ခြင်းအားဖြင့် အပ်ပလီကေးရှင်းအား ကွန်ယက်အသွားအလာအားကြားဖြတ်စေရန် ခွင့်ပြုခြင်းဖြစ်သည်။"<b>"အပ်ပလီကေးရှင်းအား မယုံကြည်သရွေ့ လက်မခံပါနှင့်"</b>" သို့မဟုတ်လျှင် မလိုလားအပ်သောဆော့ဖ်ဝဲမှ သင့်ဒေတာများအားအပေးအယူလုပ်နိုင်စေရန် ဘေးအန္တရာယ်ရှိပါသည်"</string>
<string name="accept" msgid="2889226408765810173">"ဤအပ်ပလီကေးရှင်းအားယုံကြည်ပါသည်"</string>
- <string name="legacy_title" msgid="192936250066580964">"VPNနှင့်ချိတ်ဆက်ထားသည်"</string>
+ <string name="legacy_title" msgid="192936250066580964">"VPNနှင့်ချိတ်ဆက်ထားသည်"</string>
<string name="configure" msgid="4905518375574791375">"ပုံပေါ်စေသည်"</string>
<string name="disconnect" msgid="971412338304200056">"ချိတ်ဆက်ခြင်းရပ်ရန်"</string>
- <string name="session" msgid="6470628549473641030">"သတ်မှတ်ပေးထားသည့်အချိန်:"</string>
+ <string name="session" msgid="6470628549473641030">"သတ်မှတ်ပေးထားသည့်အချိန်:"</string>
<string name="duration" msgid="3584782459928719435">"အချိန်ကာလ-"</string>
<string name="data_transmitted" msgid="7988167672982199061">"ပို့သည်-"</string>
<string name="data_received" msgid="4062776929376067820">"လက်ခံရရှိသည်"</string>
diff --git a/packages/VpnDialogs/res/values-zh-rCN/strings.xml b/packages/VpnDialogs/res/values-zh-rCN/strings.xml
index ed844ad..b175d0c 100644
--- a/packages/VpnDialogs/res/values-zh-rCN/strings.xml
+++ b/packages/VpnDialogs/res/values-zh-rCN/strings.xml
@@ -16,10 +16,10 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="prompt" msgid="8359175999006833462">"“<xliff:g id="APP">%s</xliff:g>”尝试创建 VPN 连接。"</string>
+ <string name="prompt" msgid="8359175999006833462">"<xliff:g id="APP">%s</xliff:g>尝试创建VPN连接。"</string>
<string name="warning" msgid="5470743576660160079">"继续操作即表示您授予此应用拦截所有网络流量的权限。"<b>"除非您信任此应用，否则请勿接受此请求。"</b>"如果您在不信任该应用的情况下接受了此请求，则可能会面临数据遭到恶意软件盗用的风险。"</string>
<string name="accept" msgid="2889226408765810173">"我信任此应用。"</string>
- <string name="legacy_title" msgid="192936250066580964">"已连接 VPN"</string>
+ <string name="legacy_title" msgid="192936250066580964">"已连接VPN"</string>
<string name="configure" msgid="4905518375574791375">"配置"</string>
<string name="disconnect" msgid="971412338304200056">"断开连接"</string>
<string name="session" msgid="6470628549473641030">"会话："</string>
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index da8ec2a..ae94654 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -272,15 +272,19 @@
mItems.add(new PowerAction());
} else if (GLOBAL_ACTION_KEY_AIRPLANE.equals(actionKey)) {
mItems.add(mAirplaneModeOn);
- } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)
- && (Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner())) {
- mItems.add(getBugReportAction());
- } else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey) && mShowSilentToggle) {
- mItems.add(mSilentModeAction);
- } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)
- && SystemProperties.getBoolean("fw.power_user_switcher", false)) {
- addUsersToMenu(mItems);
+ } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)) {
+ if (Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner()) {
+ mItems.add(getBugReportAction());
+ }
+ } else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey)) {
+ if (mShowSilentToggle) {
+ mItems.add(mSilentModeAction);
+ }
+ } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)) {
+ if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {
+ addUsersToMenu(mItems);
+ }
} else if (GLOBAL_ACTION_KEY_SETTINGS.equals(actionKey)) {
mItems.add(getSettingsAction());
} else if (GLOBAL_ACTION_KEY_LOCKDOWN.equals(actionKey)) {
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 964acbd..73358c8 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -3559,6 +3559,10 @@
if (transitionId != -1 && transitionId != R.transition.no_transition) {
TransitionInflater inflater = TransitionInflater.from(getContext());
transition = inflater.inflateTransition(transitionId);
+ if (transition instanceof TransitionSet &&
+ ((TransitionSet)transition).getTransitionCount() == 0) {
+ transition = null;
+ }
}
return transition;
}
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ca260ec..3f7c72e 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -845,16 +845,16 @@
break;
case SHORT_PRESS_POWER_GO_TO_SLEEP:
mPowerManager.goToSleep(eventTime,
- PowerManager.GO_TO_SLEEP_REASON_USER, 0);
+ PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON, 0);
break;
case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP:
mPowerManager.goToSleep(eventTime,
- PowerManager.GO_TO_SLEEP_REASON_USER,
+ PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON,
PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
break;
case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME:
mPowerManager.goToSleep(eventTime,
- PowerManager.GO_TO_SLEEP_REASON_USER,
+ PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON,
PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
launchHomeFromHotKey();
break;
@@ -2064,8 +2064,11 @@
}
@Override
- public Animation createForceHideEnterAnimation(boolean onWallpaper) {
- if (onWallpaper) {
+ public Animation createForceHideEnterAnimation(boolean onWallpaper,
+ boolean goingToNotificationShade) {
+ if (goingToNotificationShade) {
+ return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_behind_enter_fade_in);
+ } else if (onWallpaper) {
Animation a = AnimationUtils.loadAnimation(mContext,
R.anim.lock_screen_behind_enter_wallpaper);
AnimationSet set = (AnimationSet) a;
@@ -2073,7 +2076,6 @@
// TODO: Use XML interpolators when we have log interpolators available in XML.
set.getAnimations().get(0).setInterpolator(mLogDecelerateInterpolator);
set.getAnimations().get(1).setInterpolator(mLogDecelerateInterpolator);
- set.getAnimations().get(2).setInterpolator(mLogDecelerateInterpolator);
return set;
} else {
Animation a = AnimationUtils.loadAnimation(mContext,
@@ -2088,8 +2090,12 @@
@Override
- public Animation createForceHideWallpaperExitAnimation() {
- return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_wallpaper_exit);
+ public Animation createForceHideWallpaperExitAnimation(boolean goingToNotificationShade) {
+ if (goingToNotificationShade) {
+ return null;
+ } else {
+ return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_wallpaper_exit);
+ }
}
private static void awakenDreams() {
@@ -4290,7 +4296,8 @@
}
if ((mEndcallBehavior
& Settings.System.END_BUTTON_BEHAVIOR_SLEEP) != 0) {
- mPowerManager.goToSleep(event.getEventTime());
+ mPowerManager.goToSleep(event.getEventTime(),
+ PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON, 0);
isWakeKey = false;
}
}
@@ -4347,7 +4354,8 @@
if (!mPowerManager.isInteractive()) {
useHapticFeedback = false; // suppress feedback if already non-interactive
}
- mPowerManager.goToSleep(event.getEventTime());
+ mPowerManager.goToSleep(event.getEventTime(),
+ PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON, 0);
isWakeKey = false;
break;
}
@@ -4766,13 +4774,19 @@
mHandler.post(new Runnable() {
@Override
public void run() {
- if (mKeyguardDelegate.isDismissable()) {
- // Can we just finish the keyguard straight away?
- mKeyguardDelegate.keyguardDone(false, true);
- } else {
- // ask the keyguard to prompt the user to authenticate if necessary
- mKeyguardDelegate.dismiss();
- }
+ // ask the keyguard to prompt the user to authenticate if necessary
+ mKeyguardDelegate.dismiss();
+ }
+ });
+ }
+ }
+
+ public void notifyActivityDrawnForKeyguardLw() {
+ if (mKeyguardDelegate != null) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mKeyguardDelegate.onActivityDrawn();
}
});
}
@@ -5246,7 +5260,7 @@
private void applyLidSwitchState() {
if (mLidState == LID_CLOSED && mLidControlsSleep) {
mPowerManager.goToSleep(SystemClock.uptimeMillis(),
- PowerManager.GO_TO_SLEEP_REASON_USER,
+ PowerManager.GO_TO_SLEEP_REASON_LID_SWITCH,
PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
}
diff --git a/policy/src/com/android/internal/policy/impl/PolicyControl.java b/policy/src/com/android/internal/policy/impl/PolicyControl.java
index ffdb520..9abd906 100644
--- a/policy/src/com/android/internal/policy/impl/PolicyControl.java
+++ b/policy/src/com/android/internal/policy/impl/PolicyControl.java
@@ -16,6 +16,7 @@
package com.android.internal.policy.impl;
+import android.app.ActivityManager;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
@@ -104,8 +105,9 @@
}
public static boolean disableImmersiveConfirmation(String pkg) {
- return sImmersivePreconfirmationsFilter != null
- && sImmersivePreconfirmationsFilter.matches(pkg);
+ return (sImmersivePreconfirmationsFilter != null
+ && sImmersivePreconfirmationsFilter.matches(pkg))
+ || ActivityManager.isRunningInTestHarness();
}
public static void reloadFromSetting(Context context) {
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
index 63a5850..aac02ad 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
@@ -334,4 +334,9 @@
mKeyguardState.bootCompleted = true;
}
+ public void onActivityDrawn() {
+ if (mKeyguardService != null) {
+ mKeyguardService.onActivityDrawn();
+ }
+ }
}
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
index 5096bd3..2778b15 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
@@ -198,6 +198,14 @@
}
}
+ public void onActivityDrawn() {
+ try {
+ mService.onActivityDrawn();
+ } catch (RemoteException e) {
+ Slog.w(TAG , "Remote Exception", e);
+ }
+ }
+
public void showAssistant() {
// Not used by PhoneWindowManager
}
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index ac76ddf..3cda6de 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -1341,9 +1341,13 @@
* @param dimX The new size of the allocation.
*
* @deprecated RenderScript objects should be immutable once created. The
- * replacement is to create a new allocation and copy the contents.
+ * replacement is to create a new allocation and copy the contents. This
+ * function will throw an exception if API 21 or higher is used.
*/
public synchronized void resize(int dimX) {
+ if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 21) {
+ throw new RSRuntimeException("Resize is not allowed in API 21+.");
+ }
if ((mType.getY() > 0)|| (mType.getZ() > 0) || mType.hasFaces() || mType.hasMipmaps()) {
throw new RSInvalidStateException("Resize only support for 1D allocations at this time.");
}
@@ -1864,7 +1868,7 @@
}
}
- static void sendBufferNotification(int id) {
+ static void sendBufferNotification(long id) {
synchronized(mAllocationMap) {
Allocation a = mAllocationMap.get(new Long(id));
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 340efef..6c5c508 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -1156,7 +1156,12 @@
}
if (msg == RS_MESSAGE_TO_CLIENT_NEW_BUFFER) {
- Allocation.sendBufferNotification(subID);
+ if (mRS.nContextGetUserMessage(mRS.mContext, rbuf) !=
+ RS_MESSAGE_TO_CLIENT_NEW_BUFFER) {
+ throw new RSDriverException("Error processing message from RenderScript.");
+ }
+ long bufferID = ((long)rbuf[1] << 32L) + ((long)rbuf[0] & 0xffffffffL);
+ Allocation.sendBufferNotification(bufferID);
continue;
}
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 16df377..13a649a 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -222,7 +222,7 @@
nDeviceCreate(JNIEnv *_env, jobject _this)
{
LOG_API("nDeviceCreate");
- return (jlong)rsDeviceCreate();
+ return (jlong)(uintptr_t)rsDeviceCreate();
}
static void
@@ -243,7 +243,7 @@
nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct)
{
LOG_API("nContextCreate");
- return (jlong)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0);
+ return (jlong)(uintptr_t)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0);
}
static jlong
@@ -267,7 +267,7 @@
sc.samplesQ = samplesQ;
LOG_API("nContextCreateGL");
- return (jlong)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi);
+ return (jlong)(uintptr_t)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi);
}
static void
@@ -409,7 +409,7 @@
nElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jboolean norm, jint size)
{
LOG_API("nElementCreate, con(%p), type(%i), kind(%i), norm(%i), size(%i)", (RsContext)con, type, kind, norm, size);
- return (jlong)rsElementCreate((RsContext)con, (RsDataType)type, (RsDataKind)kind, norm, size);
+ return (jlong)(uintptr_t)rsElementCreate((RsContext)con, (RsDataType)type, (RsDataKind)kind, norm, size);
}
static jlong
@@ -435,7 +435,7 @@
const char **nameArray = names.c_str();
size_t *sizeArray = names.c_str_len();
- jlong id = (jlong)rsElementCreate2((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsElementCreate2((RsContext)con,
(const RsElement *)ids, fieldCount,
nameArray, fieldCount * sizeof(size_t), sizeArray,
(const uint32_t *)arraySizes, fieldCount);
@@ -445,7 +445,7 @@
_env->ReleaseLongArrayElements(_ids, jIds, JNI_ABORT);
_env->ReleaseIntArrayElements(_arraySizes, jArraySizes, JNI_ABORT);
- return (jlong)id;
+ return (jlong)(uintptr_t)id;
}
static void
@@ -483,7 +483,7 @@
rsaElementGetSubElements((RsContext)con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize);
for(uint32_t i = 0; i < dataSize; i++) {
- const jlong id = (jlong)ids[i];
+ const jlong id = (jlong)(uintptr_t)ids[i];
const jint arraySize = (jint)arraySizes[i];
_env->SetObjectArrayElement(_names, i, _env->NewStringUTF(names[i]));
_env->SetLongArrayRegion(_IDs, i, 1, &id);
@@ -504,7 +504,7 @@
LOG_API("nTypeCreate, con(%p) eid(%p), x(%i), y(%i), z(%i), mips(%i), faces(%i), yuv(%i)",
(RsContext)con, eid, dimx, dimy, dimz, mips, faces, yuv);
- return (jlong)rsTypeCreate((RsContext)con, (RsElement)eid, dimx, dimy, dimz, mips, faces, yuv);
+ return (jlong)(uintptr_t)rsTypeCreate((RsContext)con, (RsElement)eid, dimx, dimy, dimz, mips, faces, yuv);
}
static void
@@ -521,7 +521,7 @@
rsaTypeGetNativeData((RsContext)con, (RsType)id, typeData, 6);
for(jint i = 0; i < elementCount; i ++) {
- const jlong data = (jlong)typeData[i];
+ const jlong data = (jlong)(uintptr_t)typeData[i];
_env->SetLongArrayRegion(_typeData, i, 1, &data);
}
}
@@ -532,7 +532,7 @@
nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jlong pointer)
{
LOG_API("nAllocationCreateTyped, con(%p), type(%p), mip(%i), usage(%i), ptr(%p)", (RsContext)con, (RsElement)type, mips, usage, (void *)pointer);
- return (jlong) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uintptr_t)pointer);
+ return (jlong)(uintptr_t) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uintptr_t)pointer);
}
static void
@@ -600,7 +600,7 @@
bitmap.lockPixels();
const void* ptr = bitmap.getPixels();
- jlong id = (jlong)rsAllocationCreateFromBitmap((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsAllocationCreateFromBitmap((RsContext)con,
(RsType)type, (RsAllocationMipmapControl)mip,
ptr, bitmap.getSize(), usage);
bitmap.unlockPixels();
@@ -616,7 +616,7 @@
bitmap.lockPixels();
const void* ptr = bitmap.getPixels();
- jlong id = (jlong)rsAllocationCreateTyped((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsAllocationCreateTyped((RsContext)con,
(RsType)type, (RsAllocationMipmapControl)mip,
(uint32_t)usage, (uintptr_t)ptr);
bitmap.unlockPixels();
@@ -632,7 +632,7 @@
bitmap.lockPixels();
const void* ptr = bitmap.getPixels();
- jlong id = (jlong)rsAllocationCubeCreateFromBitmap((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsAllocationCubeCreateFromBitmap((RsContext)con,
(RsType)type, (RsAllocationMipmapControl)mip,
ptr, bitmap.getSize(), usage);
bitmap.unlockPixels();
@@ -810,7 +810,7 @@
nAllocationGetType(JNIEnv *_env, jobject _this, jlong con, jlong a)
{
LOG_API("nAllocationGetType, con(%p), a(%p)", (RsContext)con, (RsAllocation)a);
- return (jlong) rsaAllocationGetType((RsContext)con, (RsAllocation)a);
+ return (jlong)(uintptr_t) rsaAllocationGetType((RsContext)con, (RsAllocation)a);
}
static void
@@ -828,7 +828,7 @@
Asset* asset = reinterpret_cast<Asset*>(native_asset);
ALOGV("______nFileA3D %p", asset);
- jlong id = (jlong)rsaFileA3DCreateFromMemory((RsContext)con, asset->getBuffer(false), asset->getLength());
+ jlong id = (jlong)(uintptr_t)rsaFileA3DCreateFromMemory((RsContext)con, asset->getBuffer(false), asset->getLength());
return id;
}
@@ -846,7 +846,7 @@
return 0;
}
- jlong id = (jlong)rsaFileA3DCreateFromAsset((RsContext)con, asset);
+ jlong id = (jlong)(uintptr_t)rsaFileA3DCreateFromAsset((RsContext)con, asset);
return id;
}
@@ -854,7 +854,7 @@
nFileA3DCreateFromFile(JNIEnv *_env, jobject _this, jlong con, jstring fileName)
{
AutoJavaStringToUTF8 fileNameUTF(_env, fileName);
- jlong id = (jlong)rsaFileA3DCreateFromFile((RsContext)con, fileNameUTF.c_str());
+ jlong id = (jlong)(uintptr_t)rsaFileA3DCreateFromFile((RsContext)con, fileNameUTF.c_str());
return id;
}
@@ -887,7 +887,7 @@
nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint index)
{
ALOGV("______nFileA3D %p", (RsFile) fileA3D);
- jlong id = (jlong)rsaFileA3DGetEntryByIndex((RsContext)con, (uint32_t)index, (RsFile)fileA3D);
+ jlong id = (jlong)(uintptr_t)rsaFileA3DGetEntryByIndex((RsContext)con, (uint32_t)index, (RsFile)fileA3D);
return id;
}
@@ -898,7 +898,7 @@
jstring fileName, jfloat fontSize, jint dpi)
{
AutoJavaStringToUTF8 fileNameUTF(_env, fileName);
- jlong id = (jlong)rsFontCreateFromFile((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsFontCreateFromFile((RsContext)con,
fileNameUTF.c_str(), fileNameUTF.length(),
fontSize, dpi);
@@ -912,7 +912,7 @@
Asset* asset = reinterpret_cast<Asset*>(native_asset);
AutoJavaStringToUTF8 nameUTF(_env, name);
- jlong id = (jlong)rsFontCreateFromMemory((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsFontCreateFromMemory((RsContext)con,
nameUTF.c_str(), nameUTF.length(),
fontSize, dpi,
asset->getBuffer(false), asset->getLength());
@@ -934,7 +934,7 @@
return 0;
}
- jlong id = (jlong)rsFontCreateFromMemory((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsFontCreateFromMemory((RsContext)con,
str.c_str(), str.length(),
fontSize, dpi,
asset->getBuffer(false), asset->getLength());
@@ -1283,7 +1283,7 @@
//rsScriptCSetText((RsContext)con, (const char *)script_ptr, length);
- ret = (jlong)rsScriptCCreate((RsContext)con,
+ ret = (jlong)(uintptr_t)rsScriptCCreate((RsContext)con,
resNameUTF.c_str(), resNameUTF.length(),
cacheDirUTF.c_str(), cacheDirUTF.length(),
(const char *)script_ptr, length);
@@ -1294,28 +1294,28 @@
_exception ? JNI_ABORT: 0);
}
- return (jlong)ret;
+ return (jlong)(uintptr_t)ret;
}
static jlong
nScriptIntrinsicCreate(JNIEnv *_env, jobject _this, jlong con, jint id, jlong eid)
{
LOG_API("nScriptIntrinsicCreate, con(%p) id(%i) element(%p)", (RsContext)con, id, (void *)eid);
- return (jlong)rsScriptIntrinsicCreate((RsContext)con, id, (RsElement)eid);
+ return (jlong)(uintptr_t)rsScriptIntrinsicCreate((RsContext)con, id, (RsElement)eid);
}
static jlong
nScriptKernelIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot, jint sig)
{
LOG_API("nScriptKernelIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con, (void *)sid, slot, sig);
- return (jlong)rsScriptKernelIDCreate((RsContext)con, (RsScript)sid, slot, sig);
+ return (jlong)(uintptr_t)rsScriptKernelIDCreate((RsContext)con, (RsScript)sid, slot, sig);
}
static jlong
nScriptFieldIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot)
{
LOG_API("nScriptFieldIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con, (void *)sid, slot);
- return (jlong)rsScriptFieldIDCreate((RsContext)con, (RsScript)sid, slot);
+ return (jlong)(uintptr_t)rsScriptFieldIDCreate((RsContext)con, (RsScript)sid, slot);
}
static jlong
@@ -1359,7 +1359,7 @@
typesPtr[i] = (RsType)jTypesPtr[i];
}
- jlong id = (jlong)rsScriptGroupCreate((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsScriptGroupCreate((RsContext)con,
(RsScriptKernelID *)kernelsPtr, kernelsLen * sizeof(RsScriptKernelID),
(RsScriptKernelID *)srcPtr, srcLen * sizeof(RsScriptKernelID),
(RsScriptKernelID *)dstkPtr, dstkLen * sizeof(RsScriptKernelID),
@@ -1412,7 +1412,7 @@
jint depthFunc)
{
LOG_API("nProgramStoreCreate, con(%p)", (RsContext)con);
- return (jlong)rsProgramStoreCreate((RsContext)con, colorMaskR, colorMaskG, colorMaskB, colorMaskA,
+ return (jlong)(uintptr_t)rsProgramStoreCreate((RsContext)con, colorMaskR, colorMaskG, colorMaskB, colorMaskA,
depthMask, ditherEnable, (RsBlendSrcFunc)srcFunc,
(RsBlendDstFunc)destFunc, (RsDepthFunc)depthFunc);
}
@@ -1461,7 +1461,7 @@
for(int i = 0; i < paramLen; ++i) {
paramPtr[i] = (uintptr_t)jParamPtr[i];
}
- jlong ret = (jlong)rsProgramFragmentCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(),
+ jlong ret = (jlong)(uintptr_t)rsProgramFragmentCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(),
nameArray, texCount, sizeArray,
paramPtr, paramLen);
@@ -1493,7 +1493,7 @@
paramPtr[i] = (uintptr_t)jParamPtr[i];
}
- jlong ret = (jlong)rsProgramVertexCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(),
+ jlong ret = (jlong)(uintptr_t)rsProgramVertexCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(),
nameArray, texCount, sizeArray,
paramPtr, paramLen);
@@ -1508,7 +1508,7 @@
nProgramRasterCreate(JNIEnv *_env, jobject _this, jlong con, jboolean pointSprite, jint cull)
{
LOG_API("nProgramRasterCreate, con(%p), pointSprite(%i), cull(%i)", (RsContext)con, pointSprite, cull);
- return (jlong)rsProgramRasterCreate((RsContext)con, pointSprite, (RsCullMode)cull);
+ return (jlong)(uintptr_t)rsProgramRasterCreate((RsContext)con, pointSprite, (RsCullMode)cull);
}
@@ -1557,7 +1557,7 @@
jint wrapS, jint wrapT, jint wrapR, jfloat aniso)
{
LOG_API("nSamplerCreate, con(%p)", (RsContext)con);
- return (jlong)rsSamplerCreate((RsContext)con,
+ return (jlong)(uintptr_t)rsSamplerCreate((RsContext)con,
(RsSamplerValue)magFilter,
(RsSamplerValue)minFilter,
(RsSamplerValue)wrapS,
@@ -1572,7 +1572,7 @@
nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jlong _loop, jfloat q) {
LOG_API("nPathCreate, con(%p)", (RsContext)con);
- jlong id = (jlong)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic,
+ jlong id = (jlong)(uintptr_t)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic,
(RsAllocation)_vtx,
(RsAllocation)_loop, q);
return id;
@@ -1600,7 +1600,7 @@
jint primLen = _env->GetArrayLength(_prim);
jint *primPtr = _env->GetIntArrayElements(_prim, NULL);
- jlong id = (jlong)rsMeshCreate((RsContext)con,
+ jlong id = (jlong)(uintptr_t)rsMeshCreate((RsContext)con,
(RsAllocation *)vtxPtr, vtxLen,
(RsAllocation *)idxPtr, idxLen,
(uint32_t *)primPtr, primLen);
@@ -1640,7 +1640,7 @@
rsaMeshGetVertices((RsContext)con, (RsMesh)mesh, allocs, (uint32_t)numVtxIDs);
for(jint i = 0; i < numVtxIDs; i ++) {
- const jlong alloc = (jlong)allocs[i];
+ const jlong alloc = (jlong)(uintptr_t)allocs[i];
_env->SetLongArrayRegion(_ids, i, 1, &alloc);
}
@@ -1658,7 +1658,7 @@
rsaMeshGetIndices((RsContext)con, (RsMesh)mesh, allocs, prims, (uint32_t)numIndices);
for(jint i = 0; i < numIndices; i ++) {
- const jlong alloc = (jlong)allocs[i];
+ const jlong alloc = (jlong)(uintptr_t)allocs[i];
const jint prim = (jint)prims[i];
_env->SetLongArrayRegion(_idxIds, i, 1, &alloc);
_env->SetIntArrayRegion(_primitives, i, 1, &prim);
diff --git a/services/appwidget/Android.mk b/services/appwidget/Android.mk
index ca38f2f..e9bab4a 100644
--- a/services/appwidget/Android.mk
+++ b/services/appwidget/Android.mk
@@ -7,4 +7,6 @@
LOCAL_SRC_FILES += \
$(call all-java-files-under,java)
+LOCAL_JAVA_LIBRARIES := services.core
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index b2d1b71..2e5d43f 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -867,10 +867,12 @@
// the timeout is suspended while a restore is in progress. Clean
// up now.
Slog.w(TAG, "Restore session timed out; aborting");
+ mActiveRestoreSession.markTimedOut();
post(mActiveRestoreSession.new EndRestoreRunnable(
BackupManagerService.this, mActiveRestoreSession));
}
}
+ break;
}
case MSG_FULL_CONFIRMATION_TIMEOUT:
@@ -7538,6 +7540,9 @@
}
}
+ // Clear any ongoing session timeout.
+ mBackupHandler.removeMessages(MSG_RESTORE_TIMEOUT);
+
// If we have a PM token, we must under all circumstances be sure to
// handshake when we've finished.
if (mPmToken > 0) {
@@ -7545,6 +7550,11 @@
try {
mPackageManagerBinder.finishPackageInstall(mPmToken);
} catch (RemoteException e) { /* can't happen */ }
+ } else {
+ // We were invoked via an active restore session, not by the Package
+ // Manager, so start up the session timeout again.
+ mBackupHandler.sendEmptyMessageDelayed(MSG_RESTORE_TIMEOUT,
+ TIMEOUT_RESTORE_INTERVAL);
}
// Kick off any work that may be needed regarding app widget restores
@@ -7558,11 +7568,6 @@
writeRestoreTokens();
}
- // Furthermore we need to reset the session timeout clock
- mBackupHandler.removeMessages(MSG_RESTORE_TIMEOUT);
- mBackupHandler.sendEmptyMessageDelayed(MSG_RESTORE_TIMEOUT,
- TIMEOUT_RESTORE_INTERVAL);
-
// done; we can finally release the wakelock and be legitimately done.
Slog.i(TAG, "Restore complete.");
mWakelock.release();
@@ -8599,7 +8604,15 @@
skip = true;
}
- if (!skip && mAutoRestore && mProvisioned) {
+ if (!mAutoRestore || !mProvisioned) {
+ if (DEBUG) {
+ Slog.w(TAG, "Non-restorable state: auto=" + mAutoRestore
+ + " prov=" + mProvisioned);
+ }
+ skip = true;
+ }
+
+ if (!skip) {
try {
// okay, we're going to attempt a restore of this package from this restore set.
// The eventual message back into the Package Manager to run the post-install
@@ -8632,7 +8645,7 @@
if (skip) {
// Auto-restore disabled or no way to attempt a restore; just tell the Package
// Manager to proceed with the post-install handling for this package.
- if (DEBUG) Slog.v(TAG, "Skipping");
+ if (DEBUG) Slog.v(TAG, "Finishing install immediately");
try {
mPackageManagerBinder.finishPackageInstall(token);
} catch (RemoteException e) { /* can't happen */ }
@@ -8726,12 +8739,17 @@
private IBackupTransport mRestoreTransport = null;
RestoreSet[] mRestoreSets = null;
boolean mEnded = false;
+ boolean mTimedOut = false;
ActiveRestoreSession(String packageName, String transport) {
mPackageName = packageName;
mRestoreTransport = getTransport(transport);
}
+ public void markTimedOut() {
+ mTimedOut = true;
+ }
+
// --- Binder interface ---
public synchronized int getAvailableRestoreSets(IRestoreObserver observer) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,
@@ -8744,6 +8762,11 @@
throw new IllegalStateException("Restore session already ended");
}
+ if (mTimedOut) {
+ Slog.i(TAG, "Session already timed out");
+ return -1;
+ }
+
long oldId = Binder.clearCallingIdentity();
try {
if (mRestoreTransport == null) {
@@ -8775,6 +8798,11 @@
throw new IllegalStateException("Restore session already ended");
}
+ if (mTimedOut) {
+ Slog.i(TAG, "Session already timed out");
+ return -1;
+ }
+
if (mRestoreTransport == null || mRestoreSets == null) {
Slog.e(TAG, "Ignoring restoreAll() with no restore set");
return -1;
@@ -8849,6 +8877,11 @@
throw new IllegalStateException("Restore session already ended");
}
+ if (mTimedOut) {
+ Slog.i(TAG, "Session already timed out");
+ return -1;
+ }
+
if (mRestoreTransport == null || mRestoreSets == null) {
Slog.e(TAG, "Ignoring restoreAll() with no restore set");
return -1;
@@ -8897,6 +8930,11 @@
throw new IllegalStateException("Restore session already ended");
}
+ if (mTimedOut) {
+ Slog.i(TAG, "Session already timed out");
+ return -1;
+ }
+
if (mPackageName != null) {
if (! mPackageName.equals(packageName)) {
Slog.e(TAG, "Ignoring attempt to restore pkg=" + packageName
@@ -8994,6 +9032,11 @@
public synchronized void endRestoreSession() {
if (DEBUG) Slog.d(TAG, "endRestoreSession");
+ if (mTimedOut) {
+ Slog.i(TAG, "Session already timed out");
+ return;
+ }
+
if (mEnded) {
throw new IllegalStateException("Restore session already ended");
}
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 21e56702..e9419ad 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.app.IAlarmManager;
import android.app.PendingIntent;
@@ -129,14 +128,17 @@
long mStartCurrentDelayTime;
long mNextNonWakeupDeliveryTime;
- private final SparseArray<AlarmClockInfo> mNextAlarmClockForUser = new SparseArray<>();
- private final SparseArray<AlarmClockInfo> mTmpSparseAlarmClockArray = new SparseArray<>();
+ private final SparseArray<AlarmManager.AlarmClockInfo> mNextAlarmClockForUser =
+ new SparseArray<>();
+ private final SparseArray<AlarmManager.AlarmClockInfo> mTmpSparseAlarmClockArray =
+ new SparseArray<>();
private final SparseBooleanArray mPendingSendNextAlarmClockChangedForUser =
new SparseBooleanArray();
private boolean mNextAlarmClockMayChange;
// May only use on mHandler's thread, locking not required.
- private final SparseArray<AlarmClockInfo> mHandlerSparseAlarmClockArray = new SparseArray<>();
+ private final SparseArray<AlarmManager.AlarmClockInfo> mHandlerSparseAlarmClockArray =
+ new SparseArray<>();
class WakeupEvent {
public long when;
@@ -619,7 +621,7 @@
void setImpl(int type, long triggerAtTime, long windowLength, long interval,
PendingIntent operation, boolean isStandalone, WorkSource workSource,
- AlarmClockInfo alarmClock) {
+ AlarmManager.AlarmClockInfo alarmClock) {
if (operation == null) {
Slog.w(TAG, "set/setRepeating ignored because there is no intent");
return;
@@ -672,7 +674,8 @@
private void setImplLocked(int type, long when, long whenElapsed, long windowLength,
long maxWhen, long interval, PendingIntent operation, boolean isStandalone,
- boolean doValidate, WorkSource workSource, AlarmClockInfo alarmClock, int userId) {
+ boolean doValidate, WorkSource workSource, AlarmManager.AlarmClockInfo alarmClock,
+ int userId) {
Alarm a = new Alarm(type, when, whenElapsed, windowLength, maxWhen, interval,
operation, workSource, alarmClock, userId);
removeLocked(operation);
@@ -714,7 +717,8 @@
private final IBinder mService = new IAlarmManager.Stub() {
@Override
public void set(int type, long triggerAtTime, long windowLength, long interval,
- PendingIntent operation, WorkSource workSource, AlarmClockInfo alarmClock) {
+ PendingIntent operation, WorkSource workSource,
+ AlarmManager.AlarmClockInfo alarmClock) {
if (workSource != null) {
getContext().enforceCallingPermission(
android.Manifest.permission.UPDATE_DEVICE_STATS,
@@ -762,7 +766,7 @@
}
@Override
- public AlarmClockInfo getNextAlarmClock(int userId) {
+ public AlarmManager.AlarmClockInfo getNextAlarmClock(int userId) {
userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
Binder.getCallingUid(), userId, false /* allowAll */, false /* requireFull */,
"getNextAlarmClock", null);
@@ -1009,7 +1013,7 @@
return null;
}
- private AlarmClockInfo getNextAlarmClockImpl(int userId) {
+ private AlarmManager.AlarmClockInfo getNextAlarmClockImpl(int userId) {
synchronized (mLock) {
return mNextAlarmClockForUser.get(userId);
}
@@ -1024,7 +1028,7 @@
}
mNextAlarmClockMayChange = false;
- SparseArray<AlarmClockInfo> nextForUser = mTmpSparseAlarmClockArray;
+ SparseArray<AlarmManager.AlarmClockInfo> nextForUser = mTmpSparseAlarmClockArray;
nextForUser.clear();
final int N = mAlarmBatches.size();
@@ -1054,9 +1058,9 @@
// Update mNextAlarmForUser with new values.
final int NN = nextForUser.size();
for (int i = 0; i < NN; i++) {
- AlarmClockInfo newAlarm = nextForUser.valueAt(i);
+ AlarmManager.AlarmClockInfo newAlarm = nextForUser.valueAt(i);
int userId = nextForUser.keyAt(i);
- AlarmClockInfo currentAlarm = mNextAlarmClockForUser.get(userId);
+ AlarmManager.AlarmClockInfo currentAlarm = mNextAlarmClockForUser.get(userId);
if (!newAlarm.equals(currentAlarm)) {
updateNextAlarmInfoForUserLocked(userId, newAlarm);
}
@@ -1072,7 +1076,8 @@
}
}
- private void updateNextAlarmInfoForUserLocked(int userId, AlarmClockInfo alarmClock) {
+ private void updateNextAlarmInfoForUserLocked(int userId,
+ AlarmManager.AlarmClockInfo alarmClock) {
if (alarmClock != null) {
if (DEBUG_ALARM_CLOCK) {
Log.v(TAG, "Next AlarmClockInfoForUser(" + userId + "): " +
@@ -1100,7 +1105,7 @@
* @see AlarmHandler#SEND_NEXT_ALARM_CLOCK_CHANGED
*/
private void sendNextAlarmClockChanged() {
- SparseArray<AlarmClockInfo> pendingUsers = mHandlerSparseAlarmClockArray;
+ SparseArray<AlarmManager.AlarmClockInfo> pendingUsers = mHandlerSparseAlarmClockArray;
pendingUsers.clear();
synchronized (mLock) {
@@ -1115,7 +1120,7 @@
final int N = pendingUsers.size();
for (int i = 0; i < N; i++) {
int userId = pendingUsers.keyAt(i);
- AlarmClockInfo alarmClock = pendingUsers.valueAt(i);
+ AlarmManager.AlarmClockInfo alarmClock = pendingUsers.valueAt(i);
Settings.System.putStringForUser(getContext().getContentResolver(),
Settings.System.NEXT_ALARM_FORMATTED,
formatNextAlarm(getContext(), alarmClock),
@@ -1129,7 +1134,7 @@
/**
* Formats an alarm like platform/packages/apps/DeskClock used to.
*/
- private static String formatNextAlarm(final Context context, AlarmClockInfo info) {
+ private static String formatNextAlarm(final Context context, AlarmManager.AlarmClockInfo info) {
String skeleton = DateFormat.is24HourFormat(context) ? "EHm" : "Ehma";
String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
return (info == null) ? "" :
@@ -1414,12 +1419,12 @@
public long whenElapsed; // 'when' in the elapsed time base
public long maxWhen; // also in the elapsed time base
public long repeatInterval;
- public final AlarmClockInfo alarmClock;
+ public final AlarmManager.AlarmClockInfo alarmClock;
public final int userId;
public Alarm(int _type, long _when, long _whenElapsed, long _windowLength, long _maxWhen,
- long _interval, PendingIntent _op, WorkSource _ws, AlarmClockInfo _info,
- int _userId) {
+ long _interval, PendingIntent _op, WorkSource _ws,
+ AlarmManager.AlarmClockInfo _info, int _userId) {
type = _type;
wakeup = _type == AlarmManager.ELAPSED_REALTIME_WAKEUP
|| _type == AlarmManager.RTC_WAKEUP;
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 07c9048..7b64139 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -121,6 +121,7 @@
private int mState;
private final BluetoothHandler mHandler;
private int mErrorRecoveryRetryCounter;
+ private final int mSystemUiUid;
private void registerForAirplaneMode(IntentFilter filter) {
final ContentResolver resolver = mContext.getContentResolver();
@@ -218,6 +219,15 @@
if (isBluetoothPersistedStateOn()) {
mEnableExternal = true;
}
+
+ int sysUiUid = -1;
+ try {
+ sysUiUid = mContext.getPackageManager().getPackageUid("com.android.systemui",
+ UserHandle.USER_OWNER);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.wtf(TAG, "Unable to resolve SystemUI's UID.", e);
+ }
+ mSystemUiUid = sysUiUid;
}
/**
@@ -1118,7 +1128,8 @@
try {
foregroundUser = ActivityManager.getCurrentUser();
valid = (callingUser == foregroundUser) ||
- callingAppId == Process.NFC_UID;
+ callingAppId == Process.NFC_UID ||
+ callingAppId == mSystemUiUid;
if (DBG) {
Log.d(TAG, "checkIfCallerIsForegroundUser: valid=" + valid
+ " callingUser=" + callingUser
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index b229c4f3..67c01e5 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -264,6 +264,8 @@
private INetworkManagementService mNetd;
private INetworkPolicyManager mPolicyManager;
+ private String mCurrentTcpBufferSizes;
+
private static final int ENABLED = 1;
private static final int DISABLED = 0;
@@ -372,6 +374,11 @@
*/
private static final int EVENT_EXPIRE_NET_TRANSITION_WAKELOCK = 24;
+ /**
+ * Used internally to indicate the system is ready.
+ */
+ private static final int EVENT_SYSTEM_READY = 25;
+
/** Handler used for internal events. */
final private InternalHandler mHandler;
@@ -1437,6 +1444,8 @@
final IntentFilter filter = new IntentFilter(Intent.ACTION_USER_PRESENT);
mContext.registerReceiver(mUserPresentReceiver, filter);
}
+
+ mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY));
}
private BroadcastReceiver mUserPresentReceiver = new BroadcastReceiver() {
@@ -1527,11 +1536,17 @@
return;
}
- if (mtu < 68 || mtu > 10000) {
+ if (LinkProperties.isValidMtu(mtu, newLp.hasGlobalIPv6Address()) == false) {
loge("Unexpected mtu value: " + mtu + ", " + iface);
return;
}
+ // Cannot set MTU without interface name
+ if (TextUtils.isEmpty(iface)) {
+ loge("Setting MTU size with null iface.");
+ return;
+ }
+
try {
if (VDBG) log("Setting MTU size: " + iface + ", " + mtu);
mNetd.setMtu(iface, mtu);
@@ -1540,30 +1555,40 @@
}
}
- /**
- * Reads the network specific TCP buffer sizes from SystemProperties
- * net.tcp.buffersize.[default|wifi|umts|edge|gprs] and set them for system
- * wide use
- */
- private void updateNetworkSettings(NetworkStateTracker nt) {
- String key = nt.getTcpBufferSizesPropName();
- String bufferSizes = key == null ? null : SystemProperties.get(key);
+ private static final String DEFAULT_TCP_BUFFER_SIZES = "4096,87380,110208,4096,16384,110208";
- if (TextUtils.isEmpty(bufferSizes)) {
- if (VDBG) log(key + " not found in system properties. Using defaults");
-
- // Setting to default values so we won't be stuck to previous values
- key = "net.tcp.buffersize.default";
- bufferSizes = SystemProperties.get(key);
+ private void updateTcpBufferSizes(NetworkAgentInfo nai) {
+ if (isDefaultNetwork(nai) == false) {
+ return;
}
- // Set values in kernel
- if (bufferSizes.length() != 0) {
- if (VDBG) {
- log("Setting TCP values: [" + bufferSizes
- + "] which comes from [" + key + "]");
- }
- setBufferSize(bufferSizes);
+ String tcpBufferSizes = nai.linkProperties.getTcpBufferSizes();
+ String[] values = null;
+ if (tcpBufferSizes != null) {
+ values = tcpBufferSizes.split(",");
+ }
+
+ if (values == null || values.length != 6) {
+ if (VDBG) log("Invalid tcpBufferSizes string: " + tcpBufferSizes +", using defaults");
+ tcpBufferSizes = DEFAULT_TCP_BUFFER_SIZES;
+ values = tcpBufferSizes.split(",");
+ }
+
+ if (tcpBufferSizes.equals(mCurrentTcpBufferSizes)) return;
+
+ try {
+ if (VDBG) Slog.d(TAG, "Setting tx/rx TCP buffers to " + tcpBufferSizes);
+
+ final String prefix = "/sys/kernel/ipv4/tcp_";
+ FileUtils.stringToFile(prefix + "rmem_min", values[0]);
+ FileUtils.stringToFile(prefix + "rmem_def", values[1]);
+ FileUtils.stringToFile(prefix + "rmem_max", values[2]);
+ FileUtils.stringToFile(prefix + "wmem_min", values[3]);
+ FileUtils.stringToFile(prefix + "wmem_def", values[4]);
+ FileUtils.stringToFile(prefix + "wmem_max", values[5]);
+ mCurrentTcpBufferSizes = tcpBufferSizes;
+ } catch (IOException e) {
+ loge("Can't set TCP buffer sizes:" + e);
}
final String defaultRwndKey = "net.tcp.default_init_rwnd";
@@ -1576,33 +1601,6 @@
}
}
- /**
- * Writes TCP buffer sizes to /sys/kernel/ipv4/tcp_[r/w]mem_[min/def/max]
- * which maps to /proc/sys/net/ipv4/tcp_rmem and tcpwmem
- *
- * @param bufferSizes in the format of "readMin, readInitial, readMax,
- * writeMin, writeInitial, writeMax"
- */
- private void setBufferSize(String bufferSizes) {
- try {
- String[] values = bufferSizes.split(",");
-
- if (values.length == 6) {
- final String prefix = "/sys/kernel/ipv4/tcp_";
- FileUtils.stringToFile(prefix + "rmem_min", values[0]);
- FileUtils.stringToFile(prefix + "rmem_def", values[1]);
- FileUtils.stringToFile(prefix + "rmem_max", values[2]);
- FileUtils.stringToFile(prefix + "wmem_min", values[3]);
- FileUtils.stringToFile(prefix + "wmem_def", values[4]);
- FileUtils.stringToFile(prefix + "wmem_max", values[5]);
- } else {
- loge("Invalid buffersize string: " + bufferSizes);
- }
- } catch (IOException e) {
- loge("Can't set tcp buffer sizes:" + e);
- }
- }
-
private void flushVmDnsCache() {
/*
* Tell the VMs to toss their DNS caches
@@ -1965,12 +1963,6 @@
*/
break;
}
- case NetworkStateTracker.EVENT_NETWORK_SUBTYPE_CHANGED: {
- info = (NetworkInfo) msg.obj;
- int type = info.getType();
- if (mNetConfigs[type].isDefault()) updateNetworkSettings(mNetTrackers[type]);
- break;
- }
}
}
}
@@ -2270,6 +2262,12 @@
handleReleaseNetworkRequest((NetworkRequest) msg.obj, msg.arg1);
break;
}
+ case EVENT_SYSTEM_READY: {
+ for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
+ nai.networkMonitor.systemReady = true;
+ }
+ break;
+ }
}
}
}
@@ -3604,6 +3602,8 @@
notification.icon = icon;
notification.flags = Notification.FLAG_AUTO_CANCEL;
notification.tickerText = title;
+ notification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(mContext, title, details, notification.contentIntent);
notification.contentIntent = intent;
@@ -4108,6 +4108,9 @@
new NetworkInfo(networkInfo), new LinkProperties(linkProperties),
new NetworkCapabilities(networkCapabilities), currentScore, mContext, mTrackerHandler,
networkMisc);
+ synchronized (this) {
+ nai.networkMonitor.systemReady = mSystemReady;
+ }
if (VDBG) log("registerNetworkAgent " + nai);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_AGENT, nai));
}
@@ -4130,6 +4133,7 @@
updateInterfaces(newLp, oldLp, netId);
updateMtu(newLp, oldLp);
+ updateTcpBufferSizes(networkAgent);
// TODO - figure out what to do for clat
// for (LinkProperties lp : newLp.getStackedLinks()) {
// updateMtu(lp, null);
@@ -4355,6 +4359,7 @@
loge("Exception setting default network :" + e);
}
handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
+ updateTcpBufferSizes(newNetwork);
}
private void handleConnectionValidated(NetworkAgentInfo newNetwork) {
@@ -4412,6 +4417,7 @@
isNewDefault = true;
updateActiveDefaultNetwork(newNetwork);
if (newNetwork.linkProperties != null) {
+ updateTcpBufferSizes(newNetwork);
setDefaultDnsSystemProperties(
newNetwork.linkProperties.getDnsServers());
} else {
@@ -4470,8 +4476,6 @@
1000);
}
}
- // TODO - read the tcp buffer size config string from somewhere
- // updateNetworkSettings();
}
// Notify battery stats service about this network, both the normal
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 4687e3f..122786f 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -66,6 +66,7 @@
import android.content.res.TypedArray;
import android.database.ContentObserver;
import android.inputmethodservice.InputMethodService;
+import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
import android.os.Handler;
@@ -392,6 +393,7 @@
private InputMethodInfo[] mIms;
private int[] mSubtypeIds;
private Locale mLastSystemLocale;
+ private boolean mShowImeWithHardKeyboard;
private final MyPackageMonitor mMyPackageMonitor = new MyPackageMonitor();
private final IPackageManager mIPackageManager;
@@ -407,17 +409,25 @@
Settings.Secure.ENABLED_INPUT_METHODS), false, this);
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this);
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this);
}
- @Override public void onChange(boolean selfChange) {
+ @Override public void onChange(boolean selfChange, Uri uri) {
+ final Uri showImeUri =
+ Settings.Secure.getUriFor(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);
synchronized (mMethodMap) {
- boolean enabledChanged = false;
- String newEnabled = mSettings.getEnabledInputMethodsStr();
- if (!mLastEnabled.equals(newEnabled)) {
- mLastEnabled = newEnabled;
- enabledChanged = true;
+ if (showImeUri.equals(uri)) {
+ updateKeyboardFromSettingsLocked();
+ } else {
+ boolean enabledChanged = false;
+ String newEnabled = mSettings.getEnabledInputMethodsStr();
+ if (!mLastEnabled.equals(newEnabled)) {
+ mLastEnabled = newEnabled;
+ enabledChanged = true;
+ }
+ updateInputMethodsFromSettingsLocked(enabledChanged);
}
- updateFromSettingsLocked(enabledChanged);
}
}
}
@@ -598,15 +608,14 @@
private class HardKeyboardListener
implements WindowManagerService.OnHardKeyboardStatusChangeListener {
@Override
- public void onHardKeyboardStatusChange(boolean available, boolean enabled) {
- mHandler.sendMessage(mHandler.obtainMessage(
- MSG_HARD_KEYBOARD_SWITCH_CHANGED, available ? 1 : 0, enabled ? 1 : 0));
+ public void onHardKeyboardStatusChange(boolean available) {
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_HARD_KEYBOARD_SWITCH_CHANGED,
+ available ? 1 : 0));
}
- public void handleHardKeyboardStatusChange(boolean available, boolean enabled) {
+ public void handleHardKeyboardStatusChange(boolean available) {
if (DEBUG) {
- Slog.w(TAG, "HardKeyboardStatusChanged: available = " + available + ", enabled = "
- + enabled);
+ Slog.w(TAG, "HardKeyboardStatusChanged: available=" + available);
}
synchronized(mMethodMap) {
if (mSwitchingDialog != null && mSwitchingDialogTitleView != null
@@ -1579,6 +1588,8 @@
final CharSequence summary = InputMethodUtils.getImeAndSubtypeDisplayName(
mContext, imi, mCurrentSubtype);
+ mImeSwitcherNotification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
mImeSwitcherNotification.setLatestEventInfo(
mContext, title, summary, mImeSwitchPendingIntent);
if ((mNotificationManager != null)
@@ -1656,6 +1667,11 @@
}
void updateFromSettingsLocked(boolean enabledMayChange) {
+ updateInputMethodsFromSettingsLocked(enabledMayChange);
+ updateKeyboardFromSettingsLocked();
+ }
+
+ void updateInputMethodsFromSettingsLocked(boolean enabledMayChange) {
if (enabledMayChange) {
List<InputMethodInfo> enabled = mSettings.getEnabledInputMethodListLocked();
for (int i=0; i<enabled.size(); i++) {
@@ -1709,6 +1725,18 @@
// TODO: Make sure that mSwitchingController and mSettings are sharing the
// the same enabled IMEs list.
mSwitchingController.resetCircularListLocked(mContext);
+
+ }
+
+ public void updateKeyboardFromSettingsLocked() {
+ mShowImeWithHardKeyboard = mSettings.isShowImeWithHardKeyboardEnabled();
+ if (mSwitchingDialog != null
+ && mSwitchingDialogTitleView != null
+ && mSwitchingDialog.isShowing()) {
+ final Switch hardKeySwitch = (Switch)mSwitchingDialogTitleView.findViewById(
+ com.android.internal.R.id.hard_keyboard_switch);
+ hardKeySwitch.setChecked(mShowImeWithHardKeyboard);
+ }
}
/* package */ void setInputMethodLocked(String id, int subtypeId) {
@@ -2593,8 +2621,7 @@
// --------------------------------------------------------------
case MSG_HARD_KEYBOARD_SWITCH_CHANGED:
- mHardKeyboardListener.handleHardKeyboardStatusChange(
- msg.arg1 == 1, msg.arg2 == 1);
+ mHardKeyboardListener.handleHardKeyboardStatusChange(msg.arg1 == 1);
return true;
}
return false;
@@ -2683,7 +2710,7 @@
if (!map.containsKey(defaultImiId)) {
Slog.w(TAG, "Default IME is uninstalled. Choose new default IME.");
if (chooseNewDefaultIMELocked()) {
- updateFromSettingsLocked(true);
+ updateInputMethodsFromSettingsLocked(true);
}
} else {
// Double check that the default IME is certainly enabled.
@@ -2810,11 +2837,11 @@
? View.VISIBLE : View.GONE);
final Switch hardKeySwitch = (Switch)mSwitchingDialogTitleView.findViewById(
com.android.internal.R.id.hard_keyboard_switch);
- hardKeySwitch.setChecked(mWindowManagerService.isHardKeyboardEnabled());
+ hardKeySwitch.setChecked(mShowImeWithHardKeyboard);
hardKeySwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- mWindowManagerService.setHardKeyboardEnabled(isChecked);
+ mSettings.setShowImeWithHardKeyboard(isChecked);
// Ensure that the input method dialog is dismissed when changing
// the hardware keyboard state.
hideInputMethodMenu();
diff --git a/services/core/java/com/android/server/IntentResolver.java b/services/core/java/com/android/server/IntentResolver.java
index 64b0487..07cc864 100644
--- a/services/core/java/com/android/server/IntentResolver.java
+++ b/services/core/java/com/android/server/IntentResolver.java
@@ -69,6 +69,124 @@
}
}
+ private boolean filterEquals(IntentFilter f1, IntentFilter f2) {
+ int s1 = f1.countActions();
+ int s2 = f2.countActions();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasAction(f1.getAction(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countCategories();
+ s2 = f2.countCategories();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasCategory(f1.getCategory(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countDataTypes();
+ s2 = f2.countDataTypes();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasExactDataType(f1.getDataType(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countDataSchemes();
+ s2 = f2.countDataSchemes();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasDataScheme(f1.getDataScheme(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countDataAuthorities();
+ s2 = f2.countDataAuthorities();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasDataAuthority(f1.getDataAuthority(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countDataPaths();
+ s2 = f2.countDataPaths();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasDataPath(f1.getDataPath(i))) {
+ return false;
+ }
+ }
+ s1 = f1.countDataSchemeSpecificParts();
+ s2 = f2.countDataSchemeSpecificParts();
+ if (s1 != s2) {
+ return false;
+ }
+ for (int i=0; i<s1; i++) {
+ if (!f2.hasDataSchemeSpecificPart(f1.getDataSchemeSpecificPart(i))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private ArrayList<F> collectFilters(F[] array, IntentFilter matching) {
+ ArrayList<F> res = null;
+ if (array != null) {
+ for (int i=0; i<array.length; i++) {
+ F cur = array[i];
+ if (cur == null) {
+ break;
+ }
+ if (filterEquals(cur, matching)) {
+ if (res == null) {
+ res = new ArrayList<>();
+ }
+ res.add(cur);
+ }
+ }
+ }
+ return res;
+ }
+
+ public ArrayList<F> findFilters(IntentFilter matching) {
+ if (matching.countDataSchemes() == 1) {
+ // Fast case.
+ return collectFilters(mSchemeToFilter.get(matching.getDataScheme(0)), matching);
+ } else if (matching.countDataTypes() != 0 && matching.countActions() == 1) {
+ // Another fast case.
+ return collectFilters(mTypedActionToFilter.get(matching.getAction(0)), matching);
+ } else if (matching.countDataTypes() == 0 && matching.countDataSchemes() == 0
+ && matching.countActions() == 1) {
+ // Last fast case.
+ return collectFilters(mActionToFilter.get(matching.getAction(0)), matching);
+ } else {
+ ArrayList<F> res = null;
+ for (F cur : mFilters) {
+ if (filterEquals(cur, matching)) {
+ if (res == null) {
+ res = new ArrayList<>();
+ }
+ res.add(cur);
+ }
+ }
+ return res;
+ }
+ }
+
public void removeFilter(F f) {
removeFilterInternal(f);
mFilters.remove(f);
diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java
index ab4d4dc..395e365 100644
--- a/services/core/java/com/android/server/NetworkScoreService.java
+++ b/services/core/java/com/android/server/NetworkScoreService.java
@@ -17,9 +17,9 @@
package com.android.server;
import android.Manifest.permission;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.net.INetworkScoreCache;
import android.net.INetworkScoreService;
@@ -30,6 +30,7 @@
import android.os.Binder;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -51,9 +52,6 @@
public class NetworkScoreService extends INetworkScoreService.Stub {
private static final String TAG = "NetworkScoreService";
- /** SharedPreference bit set to true after the service is first initialized. */
- private static final String PREF_SCORING_PROVISIONED = "is_provisioned";
-
private final Context mContext;
private final Map<Integer, INetworkScoreCache> mScoreCaches;
@@ -65,8 +63,8 @@
/** Called when the system is ready to run third-party code but before it actually does so. */
void systemReady() {
- SharedPreferences prefs = mContext.getSharedPreferences(TAG, Context.MODE_PRIVATE);
- if (!prefs.getBoolean(PREF_SCORING_PROVISIONED, false)) {
+ ContentResolver cr = mContext.getContentResolver();
+ if (Settings.Global.getInt(cr, Settings.Global.NETWORK_SCORING_PROVISIONED, 0) == 0) {
// On first run, we try to initialize the scorer to the one configured at build time.
// This will be a no-op if the scorer isn't actually valid.
String defaultPackage = mContext.getResources().getString(
@@ -74,7 +72,7 @@
if (!TextUtils.isEmpty(defaultPackage)) {
NetworkScorerAppManager.setActiveScorer(mContext, defaultPackage);
}
- prefs.edit().putBoolean(PREF_SCORING_PROVISIONED, true).apply();
+ Settings.Global.putInt(cr, Settings.Global.NETWORK_SCORING_PROVISIONED, 1);
}
}
diff --git a/core/java/com/android/server/SystemService.java b/services/core/java/com/android/server/SystemService.java
similarity index 100%
rename from core/java/com/android/server/SystemService.java
rename to services/core/java/com/android/server/SystemService.java
diff --git a/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
similarity index 100%
rename from core/java/com/android/server/SystemServiceManager.java
rename to services/core/java/com/android/server/SystemServiceManager.java
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index 4c6b772..d1b4569 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -479,7 +479,7 @@
// keep screen on when charging and in car mode
boolean keepScreenOn = mCharging &&
((mCarModeEnabled && mCarModeKeepsScreenOn &&
- (mCarModeEnableFlags & UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK) == 0) ||
+ (mCarModeEnableFlags & UiModeManager.ENABLE_CAR_MODE_ALLOW_SLEEP) == 0) ||
(mCurUiMode == Configuration.UI_MODE_TYPE_DESK && mDeskModeKeepsScreenOn));
if (keepScreenOn != mWakeLock.isHeld()) {
if (keepScreenOn) {
@@ -599,6 +599,8 @@
n.defaults = Notification.DEFAULT_LIGHTS;
n.flags = Notification.FLAG_ONGOING_EVENT;
n.when = 0;
+ n.color = context.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
n.setLatestEventInfo(
context,
context.getString(R.string.car_mode_disable_notification_title),
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 2a66baf..94d979e 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1700,6 +1700,8 @@
subtitle = titleAndSubtitle.substring(index + 1);
}
UserHandle user = new UserHandle(userId);
+ n.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
n.setLatestEventInfo(mContext, title, subtitle,
PendingIntent.getActivityAsUser(mContext, 0, intent,
PendingIntent.FLAG_CANCEL_CURRENT, null, user));
@@ -2968,6 +2970,8 @@
UserHandle user = new UserHandle(userId);
final String notificationTitleFormat =
mContext.getText(R.string.notification_title).toString();
+ n.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
n.setLatestEventInfo(mContext,
String.format(notificationTitleFormat, account.name),
message, PendingIntent.getActivityAsUser(
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index d6e51f3..0bdb964 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.List;
+import android.os.DeadObjectException;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemProperties;
@@ -1424,6 +1425,9 @@
app.repProcState);
r.postNotification();
created = true;
+ } catch (DeadObjectException e) {
+ Slog.w(TAG, "Application dead when creating service " + r);
+ mAm.appDiedLocked(app);
} finally {
if (!created) {
app.services.remove(r);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 6054401..b1d84f58 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1472,6 +1472,8 @@
notification.defaults = 0; // please be quiet
notification.sound = null;
notification.vibrate = null;
+ notification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(context, text,
mContext.getText(R.string.heavy_weight_notification_detail),
PendingIntent.getActivityAsUser(mContext, 0, root.intent,
@@ -2031,7 +2033,7 @@
ApplicationInfo info = mContext.getPackageManager().getApplicationInfo(
"android", STOCK_PM_FLAGS);
- mSystemThread.installSystemApplicationInfo(info);
+ mSystemThread.installSystemApplicationInfo(info, getClass().getClassLoader());
synchronized (this) {
ProcessRecord app = newProcessRecordLocked(info, info.processName, false, 0);
@@ -3434,6 +3436,70 @@
}
@Override
+ public final int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo,
+ String resultWho, int requestCode, int startFlags,
+ String profileFile, ParcelFileDescriptor profileFd, Bundle options) {
+
+ // This is very dangerous -- it allows you to perform a start activity (including
+ // permission grants) as any app that may launch one of your own activities. So
+ // we will only allow this to be done from activities that are part of the core framework,
+ // and then only when they are running as the system.
+ final ActivityRecord sourceRecord;
+ final int targetUid;
+ final String targetPackage;
+ synchronized (this) {
+ if (resultTo == null) {
+ throw new SecurityException("Must be called from an activity");
+ }
+ sourceRecord = mStackSupervisor.isInAnyStackLocked(resultTo);
+ if (sourceRecord == null) {
+ throw new SecurityException("Called with bad activity token: " + resultTo);
+ }
+ if (!sourceRecord.info.packageName.equals("android")) {
+ throw new SecurityException(
+ "Must be called from an activity that is declared in the android package");
+ }
+ if (sourceRecord.app == null) {
+ throw new SecurityException("Called without a process attached to activity");
+ }
+ if (UserHandle.getAppId(sourceRecord.app.uid) != Process.SYSTEM_UID) {
+ // This is still okay, as long as this activity is running under the
+ // uid of the original calling activity.
+ if (sourceRecord.app.uid != sourceRecord.launchedFromUid) {
+ throw new SecurityException(
+ "Calling activity in uid " + sourceRecord.app.uid
+ + " must be system uid or original calling uid "
+ + sourceRecord.launchedFromUid);
+ }
+ }
+ targetUid = sourceRecord.launchedFromUid;
+ targetPackage = sourceRecord.launchedFromPackage;
+ }
+
+ // TODO: Switch to user app stacks here.
+ try {
+ int ret = mStackSupervisor.startActivityMayWait(null, targetUid, targetPackage, intent,
+ resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,
+ null, null, null, null, options, UserHandle.getUserId(targetUid), null);
+ return ret;
+ } catch (SecurityException e) {
+ // XXX need to figure out how to propagate to original app.
+ // A SecurityException here is generally actually a fault of the original
+ // calling activity (such as a fairly granting permissions), so propagate it
+ // back to them.
+ /*
+ StringBuilder msg = new StringBuilder();
+ msg.append("While launching");
+ msg.append(intent.toString());
+ msg.append(": ");
+ msg.append(e.getMessage());
+ */
+ throw e;
+ }
+ }
+
+ @Override
public final WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo,
String resultWho, int requestCode, int startFlags, String profileFile,
@@ -4201,6 +4267,10 @@
}
}
+ final void appDiedLocked(ProcessRecord app) {
+ appDiedLocked(app, app.pid, app.thread);
+ }
+
final void appDiedLocked(ProcessRecord app, int pid,
IApplicationThread thread) {
@@ -5639,17 +5709,13 @@
}
@Override
- public void dismissKeyguardOnNextActivity() {
- enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");
+ public void keyguardWaitingForActivityDrawn() {
+ enforceNotIsolatedCaller("keyguardWaitingForActivityDrawn");
final long token = Binder.clearCallingIdentity();
try {
synchronized (this) {
if (DEBUG_LOCKSCREEN) logLockScreen("");
- if (mLockScreenShown) {
- mLockScreenShown = false;
- comeOutOfSleepIfNeededLocked();
- }
- mStackSupervisor.setDismissKeyguard(true);
+ mWindowManager.keyguardWaitingForActivityDrawn();
}
} finally {
Binder.restoreCallingIdentity(token);
@@ -5794,13 +5860,13 @@
}
@Override
- public final void mediaResourcesReleased(IBinder token) {
+ public final void backgroundResourcesReleased(IBinder token) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized (this) {
ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) {
- stack.mediaResourcesReleased(token);
+ stack.backgroundResourcesReleased(token);
}
}
} finally {
@@ -8478,7 +8544,7 @@
"Existing provider " + cpr.name.flattenToShortString()
+ " is crashing; detaching " + r);
boolean lastRef = decProviderCountLocked(conn, cpr, token, stable);
- appDiedLocked(cpr.proc, cpr.proc.pid, cpr.proc.thread);
+ appDiedLocked(cpr.proc);
if (!lastRef) {
// This wasn't the last ref our process had on
// the provider... we have now been killed, bail.
@@ -8928,7 +8994,7 @@
+ ") early provider death");
final long ident = Binder.clearCallingIdentity();
try {
- appDiedLocked(proc, proc.pid, proc.thread);
+ appDiedLocked(proc);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -9263,8 +9329,7 @@
void logLockScreen(String msg) {
if (DEBUG_LOCKSCREEN) Slog.d(TAG, Debug.getCallers(2) + ":" + msg +
" mLockScreenShown=" + mLockScreenShown + " mWentToSleep=" +
- mWentToSleep + " mSleeping=" + mSleeping + " mDismissKeyguardOnNextActivity=" +
- mStackSupervisor.mDismissKeyguardOnNextActivity);
+ mWentToSleep + " mSleeping=" + mSleeping);
}
private void comeOutOfSleepIfNeededLocked() {
@@ -9663,7 +9728,7 @@
}
if (r.changeWindowTranslucency(true)) {
mWindowManager.setAppFullscreen(token, true);
- r.task.stack.releaseMediaResources();
+ r.task.stack.releaseBackgroundResources();
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0);
return true;
}
@@ -9704,13 +9769,13 @@
}
@Override
- public boolean setMediaPlaying(IBinder token, boolean playing) {
+ public boolean requestVisibleBehind(IBinder token, boolean visible) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized (this) {
final ActivityRecord r = ActivityRecord.isInStackLocked(token);
if (r != null) {
- return mStackSupervisor.setMediaPlayingLocked(r, playing);
+ return mStackSupervisor.requestVisibleBehindLocked(r, visible);
}
}
return false;
@@ -9720,15 +9785,15 @@
}
@Override
- public boolean isBackgroundMediaPlaying(IBinder token) {
+ public boolean isBackgroundVisibleBehind(IBinder token) {
final long origId = Binder.clearCallingIdentity();
try {
synchronized (this) {
final ActivityStack stack = ActivityRecord.getStackLocked(token);
- final boolean playing = stack == null ? false : stack.isMediaPlaying();
- if (ActivityStackSupervisor.DEBUG_MEDIA_VISIBILITY) Slog.d(TAG,
- "isBackgroundMediaPlaying: stack=" + stack + " playing=" + playing);
- return playing;
+ final boolean visible = stack == null ? false : stack.hasVisibleBehindActivity();
+ if (ActivityStackSupervisor.DEBUG_VISIBLE_BEHIND) Slog.d(TAG,
+ "isBackgroundVisibleBehind: stack=" + stack + " visible=" + visible);
+ return visible;
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -11403,6 +11468,7 @@
pw.println(" [-a] [-c] [-h] [cmd] ...");
pw.println(" cmd may be one of:");
pw.println(" a[ctivities]: activity stack state");
+ pw.println(" r[recents]: recent activities state");
pw.println(" b[roadcasts] [PACKAGE_NAME] [history [-s]]: broadcast state");
pw.println(" i[ntents] [PACKAGE_NAME]: pending intent state");
pw.println(" p[rocesses] [PACKAGE_NAME]: process state");
@@ -11436,6 +11502,10 @@
synchronized (this) {
dumpActivitiesLocked(fd, pw, args, opti, true, dumpClient, null);
}
+ } else if ("recents".equals(cmd) || "r".equals(cmd)) {
+ synchronized (this) {
+ dumpRecentsLocked(fd, pw, args, opti, true, null);
+ }
} else if ("broadcasts".equals(cmd) || "b".equals(cmd)) {
String[] newArgs;
String name;
@@ -11579,6 +11649,11 @@
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
+ dumpRecentsLocked(fd, pw, args, opti, dumpAll, dumpPackage);
+ pw.println();
+ if (dumpAll) {
+ pw.println("-------------------------------------------------------------------------------");
+ }
dumpActivitiesLocked(fd, pw, args, opti, dumpAll, dumpClient, dumpPackage);
pw.println();
if (dumpAll) {
@@ -11613,6 +11688,17 @@
mStackSupervisor.dump(pw, " ");
}
+ if (!printedAnything) {
+ pw.println(" (nothing)");
+ }
+ }
+
+ void dumpRecentsLocked(FileDescriptor fd, PrintWriter pw, String[] args,
+ int opti, boolean dumpAll, String dumpPackage) {
+ pw.println("ACTIVITY MANAGER RECENT ACTIVITIES (dumpsys activity recents)");
+
+ boolean printedAnything = false;
+
if (mRecentTasks.size() > 0) {
boolean printedHeader = false;
@@ -11626,9 +11712,6 @@
}
}
if (!printedHeader) {
- if (needSep) {
- pw.println();
- }
pw.println(" Recent tasks:");
printedHeader = true;
printedAnything = true;
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index e528d57..abacb2d 100755
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -575,6 +575,10 @@
void makeFinishing() {
if (!finishing) {
+ if (this == task.stack.getVisibleBehindActivity()) {
+ // A finishing activity should not remain as visible in the background
+ mStackSupervisor.requestVisibleBehindLocked(this, false);
+ }
finishing = true;
if (stopped) {
clearOptionsLocked();
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 4653742..e309a03 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -46,7 +46,6 @@
import com.android.server.Watchdog;
import com.android.server.am.ActivityManagerService.ItemMatcher;
import com.android.server.am.ActivityStackSupervisor.ActivityContainer;
-import com.android.server.am.ActivityStackSupervisor.ActivityDisplay;
import com.android.server.wm.AppTransition;
import com.android.server.wm.TaskGroup;
import com.android.server.wm.WindowManagerService;
@@ -249,7 +248,7 @@
static final int STOP_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 4;
static final int DESTROY_ACTIVITIES_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 5;
static final int TRANSLUCENT_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 6;
- static final int STOP_MEDIA_PLAYING_TIMEOUT_MSG =
+ static final int RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG =
ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 7;
static class ScheduleDestroyArgs {
@@ -325,10 +324,10 @@
notifyActivityDrawnLocked(null);
}
} break;
- case STOP_MEDIA_PLAYING_TIMEOUT_MSG: {
+ case RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG: {
synchronized (mService) {
- final ActivityRecord r = getMediaPlayer();
- Slog.e(TAG, "Timeout waiting for stopMediaPlaying player=" + r);
+ final ActivityRecord r = getVisibleBehindActivity();
+ Slog.e(TAG, "Timeout waiting for cancelVisibleBehind player=" + r);
if (r != null) {
mService.killAppAtUsersRequest(r.app, null);
}
@@ -935,8 +934,8 @@
mHandler.removeMessages(STOP_TIMEOUT_MSG, r);
r.stopped = true;
r.state = ActivityState.STOPPED;
- if (mActivityContainer.mActivityDisplay.mMediaPlayingActivity == r) {
- mStackSupervisor.setMediaPlayingLocked(r, false);
+ if (mActivityContainer.mActivityDisplay.mVisibleBehindActivity == r) {
+ mStackSupervisor.requestVisibleBehindLocked(r, false);
}
if (r.finishing) {
r.clearOptionsLocked();
@@ -975,8 +974,8 @@
// the current instance before starting the new one.
if (DEBUG_PAUSE) Slog.v(TAG, "Destroying after pause: " + prev);
destroyActivityLocked(prev, true, "pause-config");
- } else if (!isMediaPlaying()) {
- // If we were playing then resumeTopActivities will release resources before
+ } else if (!hasVisibleBehindActivity()) {
+ // If we were visible then resumeTopActivities will release resources before
// stopping.
mStackSupervisor.mStoppingActivities.add(prev);
if (mStackSupervisor.mStoppingActivities.size() > 3 ||
@@ -1059,7 +1058,7 @@
if (next.nowVisible) {
// We won't get a call to reportActivityVisibleLocked() so dismiss lockscreen now.
- mStackSupervisor.dismissKeyguard();
+ mStackSupervisor.notifyActivityDrawnForKeyguard();
}
// schedule an idle timeout in case the app doesn't do it for us.
@@ -1333,8 +1332,8 @@
case PAUSED:
// This case created for transitioning activities from
// translucent to opaque {@link Activity#convertToOpaque}.
- if (getMediaPlayer() == r) {
- releaseMediaResources();
+ if (getVisibleBehindActivity() == r) {
+ releaseBackgroundResources();
} else {
if (!mStackSupervisor.mStoppingActivities.contains(r)) {
mStackSupervisor.mStoppingActivities.add(r);
@@ -2937,8 +2936,8 @@
// Get rid of any pending idle timeouts.
removeTimeoutsForActivityLocked(r);
- if (getMediaPlayer() == r) {
- mStackSupervisor.setMediaPlayingLocked(r, false);
+ if (getVisibleBehindActivity() == r) {
+ mStackSupervisor.requestVisibleBehindLocked(r, false);
}
}
@@ -3160,47 +3159,48 @@
}
}
- void releaseMediaResources() {
- if (isMediaPlaying() && !mHandler.hasMessages(STOP_MEDIA_PLAYING_TIMEOUT_MSG)) {
- final ActivityRecord r = getMediaPlayer();
- if (DEBUG_STATES) Slog.d(TAG, "releaseMediaResources activtyDisplay=" +
- mActivityContainer.mActivityDisplay + " mediaPlayer=" + r + " app=" + r.app +
+ void releaseBackgroundResources() {
+ if (hasVisibleBehindActivity() &&
+ !mHandler.hasMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG)) {
+ final ActivityRecord r = getVisibleBehindActivity();
+ if (DEBUG_STATES) Slog.d(TAG, "releaseBackgroundResources activtyDisplay=" +
+ mActivityContainer.mActivityDisplay + " visibleBehind=" + r + " app=" + r.app +
" thread=" + r.app.thread);
if (r != null && r.app != null && r.app.thread != null) {
try {
- r.app.thread.scheduleStopMediaPlaying(r.appToken);
+ r.app.thread.scheduleCancelVisibleBehind(r.appToken);
} catch (RemoteException e) {
}
- mHandler.sendEmptyMessageDelayed(STOP_MEDIA_PLAYING_TIMEOUT_MSG, 500);
+ mHandler.sendEmptyMessageDelayed(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG, 500);
} else {
- Slog.e(TAG, "releaseMediaResources: activity " + r + " no longer running");
- mediaResourcesReleased(r.appToken);
+ Slog.e(TAG, "releaseBackgroundResources: activity " + r + " no longer running");
+ backgroundResourcesReleased(r.appToken);
}
}
}
- final void mediaResourcesReleased(IBinder token) {
- mHandler.removeMessages(STOP_MEDIA_PLAYING_TIMEOUT_MSG);
- final ActivityRecord r = getMediaPlayer();
+ final void backgroundResourcesReleased(IBinder token) {
+ mHandler.removeMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG);
+ final ActivityRecord r = getVisibleBehindActivity();
if (r != null) {
mStackSupervisor.mStoppingActivities.add(r);
- setMediaPlayer(null);
+ setVisibleBehindActivity(null);
}
mStackSupervisor.resumeTopActivitiesLocked();
}
- boolean isMediaPlaying() {
- return isAttached() && mActivityContainer.mActivityDisplay.isMediaPlaying();
+ boolean hasVisibleBehindActivity() {
+ return isAttached() && mActivityContainer.mActivityDisplay.hasVisibleBehindActivity();
}
- void setMediaPlayer(ActivityRecord r) {
+ void setVisibleBehindActivity(ActivityRecord r) {
if (isAttached()) {
- mActivityContainer.mActivityDisplay.setMediaPlaying(r);
+ mActivityContainer.mActivityDisplay.setVisibleBehindActivity(r);
}
}
- ActivityRecord getMediaPlayer() {
- return isAttached() ? mActivityContainer.mActivityDisplay.mMediaPlayingActivity : null;
+ ActivityRecord getVisibleBehindActivity() {
+ return isAttached() ? mActivityContainer.mActivityDisplay.mVisibleBehindActivity : null;
}
private void removeHistoryRecordsForAppLocked(ArrayList<ActivityRecord> list,
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 3d23cb7..931f448 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -115,7 +115,7 @@
static final boolean DEBUG_APP = DEBUG || false;
static final boolean DEBUG_CONTAINERS = DEBUG || false;
static final boolean DEBUG_IDLE = DEBUG || false;
- static final boolean DEBUG_MEDIA_VISIBILITY = DEBUG || false;
+ static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false;
static final boolean DEBUG_SAVED_STATE = DEBUG || false;
static final boolean DEBUG_SCREENSHOTS = DEBUG || false;
static final boolean DEBUG_STATES = DEBUG || false;
@@ -167,9 +167,6 @@
WindowManagerService mWindowManager;
DisplayManager mDisplayManager;
- /** Dismiss the keyguard after the next activity is displayed? */
- boolean mDismissKeyguardOnNextActivity = false;
-
/** Identifier counter for all ActivityStacks */
private int mLastStackId = HOME_STACK_ID;
@@ -363,12 +360,9 @@
}
}
- void dismissKeyguard() {
+ void notifyActivityDrawnForKeyguard() {
if (ActivityManagerService.DEBUG_LOCKSCREEN) mService.logLockScreen("");
- if (mDismissKeyguardOnNextActivity) {
- mDismissKeyguardOnNextActivity = false;
- mWindowManager.dismissKeyguard();
- }
+ mWindowManager.notifyActivityDrawnForKeyguard();
}
ActivityStack getFocusedStack() {
@@ -439,9 +433,8 @@
return mService.startHomeActivityLocked(mCurrentUser);
}
- void setDismissKeyguard(boolean dismiss) {
- if (ActivityManagerService.DEBUG_LOCKSCREEN) mService.logLockScreen(" dismiss=" + dismiss);
- mDismissKeyguardOnNextActivity = dismiss;
+ void keyguardWaitingForActivityDrawn() {
+ mWindowManager.keyguardWaitingForActivityDrawn();
}
TaskRecord anyTaskForIdLocked(int id) {
@@ -660,7 +653,7 @@
w.thisTime = w.totalTime;
}
mService.notifyAll();
- dismissKeyguard();
+ notifyActivityDrawnForKeyguard();
}
void reportActivityLaunchedLocked(boolean timeout, ActivityRecord r,
@@ -1165,7 +1158,7 @@
Slog.e(TAG, "Second failure launching "
+ r.intent.getComponent().flattenToShortString()
+ ", giving up", e);
- mService.appDiedLocked(app, app.pid, app.thread);
+ mService.appDiedLocked(app);
stack.requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,
"2nd-crash", false);
return false;
@@ -1371,7 +1364,6 @@
resultRecord, resultWho, requestCode,
Activity.RESULT_CANCELED, null);
}
- setDismissKeyguard(false);
ActivityOptions.abort(options);
return err;
}
@@ -1386,7 +1378,6 @@
resultRecord, resultWho, requestCode,
Activity.RESULT_CANCELED, null);
}
- setDismissKeyguard(false);
String msg;
if (!aInfo.exported) {
msg = "Permission Denial: starting " + intent.toString()
@@ -1425,7 +1416,6 @@
}
// We pretend to the caller that it was really started, but
// they will just get a cancel result.
- setDismissKeyguard(false);
ActivityOptions.abort(options);
return ActivityManager.START_SUCCESS;
}
@@ -1444,7 +1434,6 @@
PendingActivityLaunch pal =
new PendingActivityLaunch(r, sourceRecord, startFlags, stack);
mPendingActivityLaunches.add(pal);
- setDismissKeyguard(false);
ActivityOptions.abort(options);
return ActivityManager.START_SWITCHES_CANCELED;
}
@@ -1466,12 +1455,12 @@
err = startActivityUncheckedLocked(r, sourceRecord, voiceSession, voiceInteractor,
startFlags, true, options);
- if (allPausedActivitiesComplete()) {
+ if (err < 0) {
// If someone asked to have the keyguard dismissed on the next
// activity start, but we are not actually doing an activity
// switch... just dismiss the keyguard now, because we
// probably want to see whatever is behind it.
- dismissKeyguard();
+ notifyActivityDrawnForKeyguard();
}
return err;
}
@@ -1554,6 +1543,7 @@
final Intent intent = r.intent;
final int callingUid = r.launchedFromUid;
+ final boolean launchSingleTop = r.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP;
final boolean launchSingleInstance = r.launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE;
final boolean launchSingleTask = r.launchMode == ActivityInfo.LAUNCH_SINGLE_TASK;
@@ -1809,8 +1799,7 @@
// If the top activity in the task is the root
// activity, deliver this new intent to it if it
// desires.
- if (((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0
- || r.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP)
+ if (((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0 || launchSingleTop)
&& intentActivity.realActivity.equals(r.realActivity)) {
ActivityStack.logStartActivity(EventLogTags.AM_NEW_INTENT, r,
intentActivity.task);
@@ -1874,7 +1863,7 @@
if (top.realActivity.equals(r.realActivity) && top.userId == r.userId) {
if (top.app != null && top.app.thread != null) {
if ((launchFlags & Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0
- || launchSingleInstance || launchSingleTask) {
+ || launchSingleTop || launchSingleTask) {
ActivityStack.logStartActivity(EventLogTags.AM_NEW_INTENT, top,
top.task);
// For paranoia, make sure we have correctly
@@ -2651,36 +2640,43 @@
}
}
- boolean setMediaPlayingLocked(ActivityRecord r, boolean playing) {
+ boolean requestVisibleBehindLocked(ActivityRecord r, boolean visible) {
final ActivityStack stack = r.task.stack;
if (stack == null) {
- if (DEBUG_MEDIA_VISIBILITY) Slog.d(TAG, "setMediaPlaying: r=" + r + " playing=" +
- playing + " stack is null");
+ if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG, "requestVisibleBehind: r=" + r + " visible=" +
+ visible + " stack is null");
return false;
}
- final boolean isPlaying = stack.isMediaPlaying();
- if (DEBUG_MEDIA_VISIBILITY) Slog.d(TAG, "setMediaPlayer: r=" + r + " playing=" +
- playing + " isPlaying=" + isPlaying);
+ final boolean isVisible = stack.hasVisibleBehindActivity();
+ if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG, "requestVisibleBehind r=" + r + " visible=" +
+ visible + " isVisible=" + isVisible);
final ActivityRecord top = topRunningActivityLocked();
- if (top == null || top == r || (playing == isPlaying)) {
- if (DEBUG_MEDIA_VISIBILITY) Slog.d(TAG, "setMediaPlaying: quick return");
- stack.setMediaPlayer(playing ? r : null);
+ if (top == null || top == r || (visible == isVisible)) {
+ if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG, "requestVisibleBehind: quick return");
+ stack.setVisibleBehindActivity(visible ? r : null);
return true;
}
// A non-top activity is reporting a visibility change.
- if (top.fullscreen || top.state != ActivityState.RESUMED || top.app == null ||
- top.app.thread == null) {
+ if ((visible && (top.fullscreen || top.state != ActivityState.RESUMED)) ||
+ top.app == null || top.app.thread == null) {
// Can't carry out this request.
- if (DEBUG_MEDIA_VISIBILITY) Slog.d(TAG, "setMediaPlaying: returning top.fullscreen=" +
- top.fullscreen+ " top.state=" + top.state + " top.app=" + top.app +
+ if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG, "requestVisibleBehind: returning top.fullscreen="
+ + top.fullscreen + " top.state=" + top.state + " top.app=" + top.app +
" top.app.thread=" + top.app.thread);
return false;
+ } else if (!visible && stack.getVisibleBehindActivity() != r) {
+ // Only the activity set as currently visible behind should actively reset its
+ // visible behind state.
+ if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG, "requestVisibleBehind: returning visible="
+ + visible + " stack.getVisibleBehindActivity()=" +
+ stack.getVisibleBehindActivity() + " r=" + r);
+ return false;
}
- stack.setMediaPlayer(playing ? r : null);
- if (!playing) {
+ stack.setVisibleBehindActivity(visible ? r : null);
+ if (!visible) {
// Make the activity immediately above r opaque.
final ActivityRecord next = stack.findNextTranslucentActivity(r);
if (next != null) {
@@ -2688,7 +2684,7 @@
}
}
try {
- top.app.thread.scheduleBackgroundMediaPlayingChanged(top.appToken, playing);
+ top.app.thread.scheduleBackgroundVisibleBehindChanged(top.appToken, visible);
} catch (RemoteException e) {
}
return true;
@@ -2852,8 +2848,6 @@
}
public void dump(PrintWriter pw, String prefix) {
- pw.print(prefix); pw.print("mDismissKeyguardOnNextActivity=");
- pw.println(mDismissKeyguardOnNextActivity);
pw.print(prefix); pw.print("mFocusedStack=" + mFocusedStack);
pw.print(" mLastFocusedStack="); pw.println(mLastFocusedStack);
pw.print(prefix); pw.println("mSleepTimeout=" + mSleepTimeout);
@@ -3715,7 +3709,7 @@
* stacks, bottommost behind. Accessed directly by ActivityManager package classes */
final ArrayList<ActivityStack> mStacks = new ArrayList<ActivityStack>();
- ActivityRecord mMediaPlayingActivity;
+ ActivityRecord mVisibleBehindActivity;
ActivityDisplay() {
}
@@ -3748,12 +3742,12 @@
bounds.y = mDisplayInfo.appHeight;
}
- void setMediaPlaying(ActivityRecord r) {
- mMediaPlayingActivity = r;
+ void setVisibleBehindActivity(ActivityRecord r) {
+ mVisibleBehindActivity = r;
}
- boolean isMediaPlaying() {
- return mMediaPlayingActivity != null;
+ boolean hasVisibleBehindActivity() {
+ return mVisibleBehindActivity != null;
}
@Override
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index d8da700..786196f 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -39,6 +39,7 @@
import android.util.Slog;
import com.android.internal.app.IBatteryStats;
+import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.PowerProfile;
import com.android.server.LocalServices;
@@ -868,6 +869,9 @@
if (noOutput) {
return;
}
+ if (BatteryStatsHelper.checkWifiOnly(mContext)) {
+ flags |= BatteryStats.DUMP_DEVICE_WIFI_ONLY;
+ }
if (useCheckinFormat) {
List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(0);
if (isRealCheckin) {
diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java
index 4c887dd..0dc163b 100644
--- a/services/core/java/com/android/server/am/CoreSettingsObserver.java
+++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java
@@ -41,12 +41,17 @@
String, Class<?>>();
private static final Map<String, Class<?>> sSystemSettingToTypeMap = new HashMap<
String, Class<?>>();
+ private static final Map<String, Class<?>> sGlobalSettingToTypeMap = new HashMap<
+ String, Class<?>>();
static {
sSecureSettingToTypeMap.put(Settings.Secure.LONG_PRESS_TIMEOUT, int.class);
// add other secure settings here...
sSystemSettingToTypeMap.put(Settings.System.TIME_12_24, String.class);
// add other system settings here...
+
+ sGlobalSettingToTypeMap.put(Settings.Global.DEBUG_VIEW_ATTRIBUTES, int.class);
+ // add other global settings here...
}
private final Bundle mCoreSettings = new Bundle();
@@ -74,6 +79,7 @@
private void sendCoreSettings() {
populateSettings(mCoreSettings, sSecureSettingToTypeMap);
populateSettings(mCoreSettings, sSystemSettingToTypeMap);
+ populateSettings(mCoreSettings, sGlobalSettingToTypeMap);
mActivityManagerService.onCoreSettingsChange(mCoreSettings);
}
@@ -89,6 +95,12 @@
mActivityManagerService.mContext.getContentResolver().registerContentObserver(
uri, false, this);
}
+
+ for (String setting : sGlobalSettingToTypeMap.keySet()) {
+ Uri uri = Settings.Global.getUriFor(setting);
+ mActivityManagerService.mContext.getContentResolver().registerContentObserver(
+ uri, false, this);
+ }
}
private void populateSettings(Bundle snapshot, Map<String, Class<?>> map) {
@@ -101,32 +113,40 @@
final String value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getString(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getString(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getString(context.getContentResolver(), setting);
}
snapshot.putString(setting, value);
} else if (type == int.class) {
final int value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getInt(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getInt(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getInt(context.getContentResolver(), setting);
}
snapshot.putInt(setting, value);
} else if (type == float.class) {
final float value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getFloat(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getFloat(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getFloat(context.getContentResolver(), setting);
}
snapshot.putFloat(setting, value);
} else if (type == long.class) {
final long value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getLong(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getLong(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getLong(context.getContentResolver(), setting);
}
snapshot.putLong(setting, value);
}
diff --git a/services/core/java/com/android/server/am/LockTaskNotify.java b/services/core/java/com/android/server/am/LockTaskNotify.java
index 6f9b23d..cf65243 100644
--- a/services/core/java/com/android/server/am/LockTaskNotify.java
+++ b/services/core/java/com/android/server/am/LockTaskNotify.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.Handler;
import android.os.Message;
+import android.view.accessibility.AccessibilityManager;
import android.widget.Toast;
import com.android.internal.R;
@@ -32,9 +33,12 @@
private final Context mContext;
private final H mHandler;
+ private AccessibilityManager mAccessibilityManager;
public LockTaskNotify(Context context) {
mContext = context;
+ mAccessibilityManager = (AccessibilityManager)
+ mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
mHandler = new H();
}
@@ -45,6 +49,9 @@
public void handleShowToast(boolean isLocked) {
String text = mContext.getString(isLocked
? R.string.lock_to_app_toast_locked : R.string.lock_to_app_toast);
+ if (!isLocked && mAccessibilityManager.isEnabled()) {
+ text = mContext.getString(R.string.lock_to_app_toast_accessible);
+ }
Toast.makeText(mContext, text, Toast.LENGTH_LONG).show();
}
diff --git a/services/core/java/com/android/server/am/LockToAppRequestDialog.java b/services/core/java/com/android/server/am/LockToAppRequestDialog.java
index 0847b52..12dcf7e 100644
--- a/services/core/java/com/android/server/am/LockToAppRequestDialog.java
+++ b/services/core/java/com/android/server/am/LockToAppRequestDialog.java
@@ -13,6 +13,7 @@
import android.provider.Settings.SettingNotFoundException;
import android.util.Slog;
import android.view.WindowManager;
+import android.view.accessibility.AccessibilityManager;
import android.widget.CheckBox;
import com.android.internal.R;
@@ -33,8 +34,12 @@
private ILockSettings mLockSettingsService;
+ private AccessibilityManager mAccessibilityService;
+
public LockToAppRequestDialog(Context context, ActivityManagerService activityManagerService) {
mContext = context;
+ mAccessibilityService = (AccessibilityManager)
+ mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
mService = activityManagerService;
}
@@ -78,7 +83,9 @@
final int unlockStringId = getLockString(task.userId);
final Resources r = Resources.getSystem();
- final String description= r.getString(R.string.lock_to_app_description);
+ final String description= r.getString(mAccessibilityService.isEnabled()
+ ? R.string.lock_to_app_description_accessible
+ : R.string.lock_to_app_description);
AlertDialog.Builder builder = new AlertDialog.Builder(mContext)
.setTitle(r.getString(R.string.lock_to_app_title))
.setMessage(description)
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index f79c026..0a66a5c 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -450,6 +450,9 @@
appInfo.packageName, null));
PendingIntent pi = PendingIntent.getActivity(ams.mContext, 0,
runningIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ localForegroundNoti.color = ams.mContext.getResources().getColor(
+ com.android.internal
+ .R.color.system_notification_accent_color);
localForegroundNoti.setLatestEventInfo(ctx,
ams.mContext.getString(
com.android.internal.R.string
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
index ae5eda3..5057994 100644
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@ -217,6 +217,8 @@
private String mServer;
private boolean mIsCaptivePortalCheckEnabled = false;
+ public boolean systemReady = false;
+
private State mDefaultState = new DefaultState();
private State mOfflineState = new OfflineState();
private State mValidatedState = new ValidatedState();
@@ -709,6 +711,8 @@
return;
}
+ if (systemReady == false) return;
+
Intent latencyBroadcast = new Intent(ACTION_NETWORK_CONDITIONS_MEASURED);
switch (mNetworkAgentInfo.networkInfo.getType()) {
case ConnectivityManager.TYPE_WIFI:
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index fa8626f..1fd114c 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -471,6 +471,8 @@
mTetheredNotification.flags = Notification.FLAG_ONGOING_EVENT;
mTetheredNotification.tickerText = title;
mTetheredNotification.visibility = Notification.VISIBILITY_PUBLIC;
+ mTetheredNotification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
mTetheredNotification.setLatestEventInfo(mContext, title, message, pi);
mTetheredNotification.category = Notification.CATEGORY_STATUS;
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index eddf414..0f6b3ad 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -735,6 +735,8 @@
.setContentIntent(mStatusIntent)
.setDefaults(0)
.setOngoing(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color))
.build();
nm.notifyAsUser(null, R.drawable.vpn_connected, notification, new UserHandle(user));
}
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index 08d6fc9..949019e 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -3064,6 +3064,8 @@
new Notification(R.drawable.stat_notify_sync_error,
mContext.getString(R.string.contentServiceSync),
System.currentTimeMillis());
+ notification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(mContext,
mContext.getString(R.string.contentServiceSyncNotificationTitle),
String.format(tooManyDeletesDescFormat.toString(), authorityName),
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 9a67321..2a1ceaa 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -37,7 +37,7 @@
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.SystemClock;
-import android.text.format.DateUtils;
+import android.os.Trace;
import android.util.MathUtils;
import android.util.Slog;
import android.util.Spline;
@@ -74,6 +74,8 @@
private static boolean DEBUG = false;
private static final boolean DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT = false;
+ private static final String SCREEN_ON_BLOCKED_TRACE_NAME = "Screen on blocked";
+
// If true, uses the electron beam on animation.
// We might want to turn this off if we cannot get a guarantee that the screen
// actually turns on and starts showing new content after the call to set the
@@ -85,7 +87,7 @@
private static final int SCREEN_DIM_MINIMUM_REDUCTION = 10;
private static final int COLOR_FADE_ON_ANIMATION_DURATION_MILLIS = 250;
- private static final int COLOR_FADE_OFF_ANIMATION_DURATION_MILLIS = 600;
+ private static final int COLOR_FADE_OFF_ANIMATION_DURATION_MILLIS = 400;
private static final int MSG_UPDATE_POWER_STATE = 1;
private static final int MSG_PROXIMITY_SENSOR_DEBOUNCED = 2;
@@ -714,11 +716,10 @@
private void blockScreenOn() {
if (!mScreenOnWasBlocked) {
+ Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, SCREEN_ON_BLOCKED_TRACE_NAME, 0);
mScreenOnWasBlocked = true;
mScreenOnBlockStartRealTime = SystemClock.elapsedRealtime();
- if (DEBUG) {
- Slog.d(TAG, "Blocked screen on.");
- }
+ Slog.i(TAG, "Blocking screen on until initial contents have been drawn.");
}
}
@@ -726,9 +727,8 @@
if (mScreenOnWasBlocked) {
mScreenOnWasBlocked = false;
long delay = SystemClock.elapsedRealtime() - mScreenOnBlockStartRealTime;
- if (delay > 1000 || DEBUG) {
- Slog.d(TAG, "Unblocked screen on after " + delay + " ms");
- }
+ Slog.i(TAG, "Unblocked screen on after " + delay + " ms");
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, SCREEN_ON_BLOCKED_TRACE_NAME, 0);
}
}
diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java
index 6522b89..a7651e4 100644
--- a/services/core/java/com/android/server/display/DisplayPowerState.java
+++ b/services/core/java/com/android/server/display/DisplayPowerState.java
@@ -23,6 +23,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.PowerManager;
+import android.os.Trace;
import android.util.FloatProperty;
import android.util.IntProperty;
import android.util.Slog;
@@ -405,19 +406,38 @@
}
boolean suspending = Display.isSuspendedState(state);
if (stateChanged && !suspending) {
- mBlanker.requestDisplayState(state);
+ requestDisplayState(state);
}
if (backlightChanged) {
- mBacklight.setBrightness(backlight);
+ setBrightness(backlight);
}
if (stateChanged && suspending) {
- mBlanker.requestDisplayState(state);
+ requestDisplayState(state);
}
}
// Let the outer class know that all changes have been applied.
postScreenUpdateThreadSafe();
}
+
+ private void requestDisplayState(int state) {
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "requestDisplayState("
+ + Display.stateToString(state) + ")");
+ try {
+ mBlanker.requestDisplayState(state);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
+ }
+
+ private void setBrightness(int backlight) {
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "setBrightness(" + backlight + ")");
+ try {
+ mBacklight.setBrightness(backlight);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
+ }
};
}
}
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 4fd006d..9c91ab5 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -21,7 +21,7 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.SystemProperties;
-import android.util.Pair;
+import android.os.Trace;
import android.util.Slog;
import android.util.SparseArray;
import android.view.Display;
@@ -224,8 +224,14 @@
@Override
public void requestDisplayStateLocked(int state) {
if (mState != state) {
- SurfaceControl.setDisplayPowerMode(getDisplayTokenLocked(),
- getPowerModeForState(state));
+ final int mode = getPowerModeForState(state);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "requestDisplayState("
+ + Display.stateToString(state) + ", id=" + mBuiltInDisplayId + ")");
+ try {
+ SurfaceControl.setDisplayPowerMode(getDisplayTokenLocked(), mode);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
mState = state;
updateDeviceInfoLocked();
}
diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
index 72ac29a..e39f0b1 100644
--- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java
@@ -265,7 +265,7 @@
mInfo.flags |= DisplayDeviceInfo.FLAG_PRIVATE
| DisplayDeviceInfo.FLAG_NEVER_BLANK;
}
- if ((mInfo.flags & DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR) != 0) {
+ if ((mFlags & DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR) != 0) {
mInfo.flags &= ~DisplayDeviceInfo.FLAG_NEVER_BLANK;
} else {
mInfo.flags |= DisplayDeviceInfo.FLAG_OWN_CONTENT_ONLY;
diff --git a/services/core/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
index a05bf2c..9d008b9 100644
--- a/services/core/java/com/android/server/display/WifiDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
@@ -502,6 +502,8 @@
.addAction(android.R.drawable.ic_menu_close_clear_cancel,
r.getString(R.string.wifi_display_notification_disconnect),
mDisconnectPendingIntent)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
.build();
} else {
notification = new Notification.Builder(context)
@@ -516,6 +518,8 @@
.addAction(android.R.drawable.ic_menu_close_clear_cancel,
r.getString(R.string.wifi_display_notification_disconnect),
mDisconnectPendingIntent)
+ .setColor(r.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
.build();
}
mNotificationManager.notifyAsUser(null,
diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java
index 334f0ac..768ccf2 100644
--- a/services/core/java/com/android/server/dreams/DreamController.java
+++ b/services/core/java/com/android/server/dreams/DreamController.java
@@ -25,6 +25,7 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.IBinder.DeathRecipient;
+import android.os.Trace;
import android.os.UserHandle;
import android.service.dreams.DreamService;
import android.service.dreams.IDreamService;
@@ -111,41 +112,46 @@
boolean isTest, boolean canDoze, int userId) {
stopDream(true /*immediate*/);
- // Close the notification shade. Don't need to send to all, but better to be explicit.
- mContext.sendBroadcastAsUser(mCloseNotificationShadeIntent, UserHandle.ALL);
-
- Slog.i(TAG, "Starting dream: name=" + name
- + ", isTest=" + isTest + ", canDoze=" + canDoze
- + ", userId=" + userId);
-
- mCurrentDream = new DreamRecord(token, name, isTest, canDoze, userId);
-
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "startDream");
try {
- mIWindowManager.addWindowToken(token, WindowManager.LayoutParams.TYPE_DREAM);
- } catch (RemoteException ex) {
- Slog.e(TAG, "Unable to add window token for dream.", ex);
- stopDream(true /*immediate*/);
- return;
- }
+ // Close the notification shade. Don't need to send to all, but better to be explicit.
+ mContext.sendBroadcastAsUser(mCloseNotificationShadeIntent, UserHandle.ALL);
- Intent intent = new Intent(DreamService.SERVICE_INTERFACE);
- intent.setComponent(name);
- intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- try {
- if (!mContext.bindServiceAsUser(intent, mCurrentDream,
- Context.BIND_AUTO_CREATE, new UserHandle(userId))) {
- Slog.e(TAG, "Unable to bind dream service: " + intent);
+ Slog.i(TAG, "Starting dream: name=" + name
+ + ", isTest=" + isTest + ", canDoze=" + canDoze
+ + ", userId=" + userId);
+
+ mCurrentDream = new DreamRecord(token, name, isTest, canDoze, userId);
+
+ try {
+ mIWindowManager.addWindowToken(token, WindowManager.LayoutParams.TYPE_DREAM);
+ } catch (RemoteException ex) {
+ Slog.e(TAG, "Unable to add window token for dream.", ex);
stopDream(true /*immediate*/);
return;
}
- } catch (SecurityException ex) {
- Slog.e(TAG, "Unable to bind dream service: " + intent, ex);
- stopDream(true /*immediate*/);
- return;
- }
- mCurrentDream.mBound = true;
- mHandler.postDelayed(mStopUnconnectedDreamRunnable, DREAM_CONNECTION_TIMEOUT);
+ Intent intent = new Intent(DreamService.SERVICE_INTERFACE);
+ intent.setComponent(name);
+ intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ try {
+ if (!mContext.bindServiceAsUser(intent, mCurrentDream,
+ Context.BIND_AUTO_CREATE, new UserHandle(userId))) {
+ Slog.e(TAG, "Unable to bind dream service: " + intent);
+ stopDream(true /*immediate*/);
+ return;
+ }
+ } catch (SecurityException ex) {
+ Slog.e(TAG, "Unable to bind dream service: " + intent, ex);
+ stopDream(true /*immediate*/);
+ return;
+ }
+
+ mCurrentDream.mBound = true;
+ mHandler.postDelayed(mStopUnconnectedDreamRunnable, DREAM_CONNECTION_TIMEOUT);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
}
public void stopDream(boolean immediate) {
@@ -153,71 +159,76 @@
return;
}
- if (!immediate) {
- if (mCurrentDream.mWakingGently) {
- return; // already waking gently
- }
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "stopDream");
+ try {
+ if (!immediate) {
+ if (mCurrentDream.mWakingGently) {
+ return; // already waking gently
+ }
- if (mCurrentDream.mService != null) {
- // Give the dream a moment to wake up and finish itself gently.
- mCurrentDream.mWakingGently = true;
- try {
- mCurrentDream.mService.wakeUp();
- mHandler.postDelayed(mStopStubbornDreamRunnable, DREAM_FINISH_TIMEOUT);
- return;
- } catch (RemoteException ex) {
- // oh well, we tried, finish immediately instead
+ if (mCurrentDream.mService != null) {
+ // Give the dream a moment to wake up and finish itself gently.
+ mCurrentDream.mWakingGently = true;
+ try {
+ mCurrentDream.mService.wakeUp();
+ mHandler.postDelayed(mStopStubbornDreamRunnable, DREAM_FINISH_TIMEOUT);
+ return;
+ } catch (RemoteException ex) {
+ // oh well, we tried, finish immediately instead
+ }
}
}
- }
- final DreamRecord oldDream = mCurrentDream;
- mCurrentDream = null;
- Slog.i(TAG, "Stopping dream: name=" + oldDream.mName
- + ", isTest=" + oldDream.mIsTest + ", canDoze=" + oldDream.mCanDoze
- + ", userId=" + oldDream.mUserId);
+ final DreamRecord oldDream = mCurrentDream;
+ mCurrentDream = null;
+ Slog.i(TAG, "Stopping dream: name=" + oldDream.mName
+ + ", isTest=" + oldDream.mIsTest + ", canDoze=" + oldDream.mCanDoze
+ + ", userId=" + oldDream.mUserId);
- mHandler.removeCallbacks(mStopUnconnectedDreamRunnable);
- mHandler.removeCallbacks(mStopStubbornDreamRunnable);
+ mHandler.removeCallbacks(mStopUnconnectedDreamRunnable);
+ mHandler.removeCallbacks(mStopStubbornDreamRunnable);
- if (oldDream.mSentStartBroadcast) {
- mContext.sendBroadcastAsUser(mDreamingStoppedIntent, UserHandle.ALL);
- }
+ if (oldDream.mSentStartBroadcast) {
+ mContext.sendBroadcastAsUser(mDreamingStoppedIntent, UserHandle.ALL);
+ }
- if (oldDream.mService != null) {
- // Tell the dream that it's being stopped so that
- // it can shut down nicely before we yank its window token out from
- // under it.
+ if (oldDream.mService != null) {
+ // Tell the dream that it's being stopped so that
+ // it can shut down nicely before we yank its window token out from
+ // under it.
+ try {
+ oldDream.mService.detach();
+ } catch (RemoteException ex) {
+ // we don't care; this thing is on the way out
+ }
+
+ try {
+ oldDream.mService.asBinder().unlinkToDeath(oldDream, 0);
+ } catch (NoSuchElementException ex) {
+ // don't care
+ }
+ oldDream.mService = null;
+ }
+
+ if (oldDream.mBound) {
+ mContext.unbindService(oldDream);
+ }
+
try {
- oldDream.mService.detach();
+ mIWindowManager.removeWindowToken(oldDream.mToken);
} catch (RemoteException ex) {
- // we don't care; this thing is on the way out
+ Slog.w(TAG, "Error removing window token for dream.", ex);
}
- try {
- oldDream.mService.asBinder().unlinkToDeath(oldDream, 0);
- } catch (NoSuchElementException ex) {
- // don't care
- }
- oldDream.mService = null;
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mListener.onDreamStopped(oldDream.mToken);
+ }
+ });
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
-
- if (oldDream.mBound) {
- mContext.unbindService(oldDream);
- }
-
- try {
- mIWindowManager.removeWindowToken(oldDream.mToken);
- } catch (RemoteException ex) {
- Slog.w(TAG, "Error removing window token for dream.", ex);
- }
-
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mListener.onDreamStopped(oldDream.mToken);
- }
- });
}
private void attach(IDreamService service) {
diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java
index 591cf25..4b812cf 100644
--- a/services/core/java/com/android/server/hdmi/Constants.java
+++ b/services/core/java/com/android/server/hdmi/Constants.java
@@ -173,6 +173,10 @@
static final int SYSTEM_AUDIO_STATUS_OFF = 0;
static final int SYSTEM_AUDIO_STATUS_ON = 1;
+ // [Menu State]
+ static final int MENU_STATE_ACTIVATED = 0;
+ static final int MENU_STATE_DEACTIVATED = 1;
+
// Bit mask used to get the routing path of the top level device.
// When &'d with the path 1.2.2.0 (0x1220), for instance, gives 1.0.0.0.
static final int ROUTING_PATH_TOP_MASK = 0xF000;
@@ -258,6 +262,12 @@
static final int MHL_RAP_ACTION_CONTENT_ON = 0x10;
static final int MHL_RAP_ACTION_CONTENT_OFF = 0x11;
+ // MHL RAPK messages.
+ static final int MHL_RAPK_NO_ERROR = 0x00;
+ static final int MHL_RAPK_UNRECOGNIZED_ACTION = 0x01;
+ static final int MHL_RAPK_UNSUPPORTED_ACTION = 0x02;
+ static final int MHL_RAPK_RESPONDER_BUSY = 0x03;
+
static final int MHL_INVALID_ADOPTER_ID = -1;
static final int MHL_INVALID_DEVICE_ID = -1;
@@ -270,5 +280,10 @@
// values which denotes the device type in HDMI Spec 1.4.
static final String PROPERTY_DEVICE_TYPE = "ro.hdmi.device_type";
+ // MHL RCPE messages
+ static final int MHL_RCPE_NO_ERROR = 0x00;
+ static final int MHL_RCPE_INEFFECTIVE_KEYCODE = 0x01;
+ static final int MHL_RCPE_RESPONDER_BUSY = 0x02;
+
private Constants() { /* cannot be instantiated */ }
}
diff --git a/services/core/java/com/android/server/hdmi/DeviceSelectAction.java b/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
index ed37ead..d155e84 100644
--- a/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
+++ b/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
@@ -23,7 +23,6 @@
import android.os.RemoteException;
import android.util.Slog;
-import com.android.server.hdmi.HdmiCecLocalDevice.ActiveSource;
import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
/**
@@ -42,9 +41,6 @@
// Time in milliseconds we wait for the device power status to turn to 'On'.
private static final int TIMEOUT_POWER_ON_MS = 5 * 1000;
- // Time in milliseconds we wait for <Active Source>.
- private static final int TIMEOUT_ACTIVE_SOURCE_MS = 20 * 1000;
-
// The number of times we try to wake up the target device before we give up
// and just send <Set Stream Path>.
private static final int LOOP_COUNTER_MAX = 20;
@@ -62,11 +58,6 @@
// maximum 100 seconds (20 * 5) before we give up and just send <Set Stream Path>.
private static final int STATE_WAIT_FOR_DEVICE_POWER_ON = 3;
- // State in which we wait for the <Active Source> in response to the command
- // <Set Stream Path> we have sent. We wait as much as TIMEOUT_ACTIVE_SOURCE_MS
- // before we give up and mark the action as failure.
- private static final int STATE_WAIT_FOR_ACTIVE_SOURCE = 4;
-
private final HdmiDeviceInfo mTarget;
private final IHdmiControlCallback mCallback;
private final HdmiCecMessage mGivePowerStatus;
@@ -129,16 +120,6 @@
return handleReportPowerStatus(params[0]);
}
return false;
- case STATE_WAIT_FOR_ACTIVE_SOURCE:
- if (opcode == Constants.MESSAGE_ACTIVE_SOURCE) {
- int physicalAddress = HdmiUtils.twoBytesToInt(params);
- ActiveSourceHandler
- .create((HdmiCecLocalDeviceTv) localDevice(), mCallback)
- .process(ActiveSource.of(cmd.getSource(), physicalAddress));
- finish();
- return true;
- }
- return false;
default:
break;
}
@@ -189,8 +170,8 @@
private void sendSetStreamPath() {
sendCommand(HdmiCecMessageBuilder.buildSetStreamPath(
getSourceAddress(), mTarget.getPhysicalAddress()));
- mState = STATE_WAIT_FOR_ACTIVE_SOURCE;
- addTimer(mState, TIMEOUT_ACTIVE_SOURCE_MS);
+ invokeCallback(HdmiControlManager.RESULT_SUCCESS);
+ finish();
}
@Override
@@ -213,10 +194,6 @@
mPowerStatusCounter++;
queryDevicePowerStatus();
break;
- case STATE_WAIT_FOR_ACTIVE_SOURCE:
- invokeCallback(HdmiControlManager.RESULT_TIMEOUT);
- finish();
- break;
}
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
index c0c8424..aed5dcc 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
@@ -21,7 +21,7 @@
/**
* Helper class to translate android keycode to hdmi cec keycode and vice versa.
*/
-public class HdmiCecKeycode {
+final class HdmiCecKeycode {
public static final int UNSUPPORTED_KEYCODE = -1;
public static final int NO_PARAM = -1;
@@ -155,7 +155,7 @@
}
/**
- * A mapping between andorid and cec keycode.
+ * A mapping between Android and CEC keycode.
*
* <p>Normal implementation of this looks like
* <pre>
@@ -174,43 +174,28 @@
private static class KeycodeEntry {
private final int mAndroidKeycode;
private final int mCecKeycode;
- private final int mParam;
private final boolean mIsRepeatable;
- private KeycodeEntry(int androidKeycode, int cecKeycode, int param, boolean isRepeatable) {
+ private KeycodeEntry(int androidKeycode, int cecKeycode, boolean isRepeatable) {
mAndroidKeycode = androidKeycode;
mCecKeycode = cecKeycode;
- mParam = param;
mIsRepeatable = isRepeatable;
}
private KeycodeEntry(int androidKeycode, int cecKeycode) {
- this(androidKeycode, cecKeycode, NO_PARAM, true);
+ this(androidKeycode, cecKeycode, true);
}
- private KeycodeEntry(int androidKeycode, int cecKeycode, boolean isRepeatable) {
- this(androidKeycode, cecKeycode, NO_PARAM, isRepeatable);
- }
-
- private byte[] toCecKeycodeIfMatched(int androidKeycode) {
+ private int toCecKeycodeIfMatched(int androidKeycode) {
if (mAndroidKeycode == androidKeycode) {
- if (mParam == NO_PARAM) {
- return new byte[] {
- (byte) (mCecKeycode & 0xFF)
- };
- } else {
- return new byte[] {
- (byte) (mCecKeycode & 0xFF),
- (byte) (mParam & 0xFF)
- };
- }
+ return mCecKeycode;
} else {
- return null;
+ return UNSUPPORTED_KEYCODE;
}
}
- private int toAndroidKeycodeIfMatched(int cecKeycode, int param) {
- if (cecKeycode == mCecKeycode && mParam == param) {
+ private int toAndroidKeycodeIfMatched(int cecKeycode) {
+ if (cecKeycode == mCecKeycode) {
return mAndroidKeycode;
} else {
return UNSUPPORTED_KEYCODE;
@@ -365,29 +350,28 @@
* Translate Android keycode to Hdmi Cec keycode.
*
* @param keycode Android keycode. For details, refer {@link KeyEvent}
- * @return array of byte which contains cec keycode and param if it has;
- * return null if failed to find matched cec keycode
+ * @return single byte CEC keycode if matched.
*/
- static byte[] androidKeyToCecKey(int keycode) {
+ static int androidKeyToCecKey(int keycode) {
for (int i = 0; i < KEYCODE_ENTRIES.length; ++i) {
- byte[] cecKeycode = KEYCODE_ENTRIES[i].toCecKeycodeIfMatched(keycode);
- if (cecKeycode != null) {
+ int cecKeycode = KEYCODE_ENTRIES[i].toCecKeycodeIfMatched(keycode);
+ if (cecKeycode != UNSUPPORTED_KEYCODE) {
return cecKeycode;
}
}
- return null;
+ return UNSUPPORTED_KEYCODE;
}
/**
* Translate Hdmi CEC keycode to Android keycode.
*
- * @param keycode Cec keycode. If has no param, put {@link #NO_PARAM}
+ * @param keycode CEC keycode
* @return cec keycode corresponding to the given android keycode.
* If finds no matched keycode, return {@link #UNSUPPORTED_KEYCODE}
*/
- static int cecKeyToAndroidKey(int keycode, int param) {
+ static int cecKeyToAndroidKey(int keycode) {
for (int i = 0; i < KEYCODE_ENTRIES.length; ++i) {
- int androidKey = KEYCODE_ENTRIES[i].toAndroidKeycodeIfMatched(keycode, param);
+ int androidKey = KEYCODE_ENTRIES[i].toAndroidKeycodeIfMatched(keycode);
if (androidKey != UNSUPPORTED_KEYCODE) {
return androidKey;
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index b894fd7..b43ad1b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -17,10 +17,15 @@
package com.android.server.hdmi;
import android.hardware.hdmi.HdmiDeviceInfo;
+import android.hardware.input.InputManager;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.SystemClock;
import android.util.Slog;
+import android.view.InputDevice;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
import com.android.internal.annotations.GuardedBy;
import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
@@ -39,15 +44,21 @@
private static final String TAG = "HdmiCecLocalDevice";
private static final int MSG_DISABLE_DEVICE_TIMEOUT = 1;
+ private static final int MSG_USER_CONTROL_RELEASE_TIMEOUT = 2;
// Timeout in millisecond for device clean up (5s).
// Normal actions timeout is 2s but some of them would have several sequence of timeout.
private static final int DEVICE_CLEANUP_TIMEOUT = 5000;
+ // Within the timer, a received <User Control Pressed> will start "Press and Hold" behavior.
+ // When it expires, we can assume <User Control Release> is received.
+ private static final int FOLLOWER_SAFETY_TIMEOUT = 550;
protected final HdmiControlService mService;
protected final int mDeviceType;
protected int mAddress;
protected int mPreferredAddress;
protected HdmiDeviceInfo mDeviceInfo;
+ protected int mLastKeycode = HdmiCecKeycode.UNSUPPORTED_KEYCODE;
+ protected int mLastKeyRepeatCount = 0;
static class ActiveSource {
int logicalAddress;
@@ -111,6 +122,9 @@
case MSG_DISABLE_DEVICE_TIMEOUT:
handleDisableDeviceTimeout();
break;
+ case MSG_USER_CONTROL_RELEASE_TIMEOUT:
+ handleUserControlReleased();
+ break;
}
}
};
@@ -230,10 +244,14 @@
return handleImageViewOn(message);
case Constants.MESSAGE_USER_CONTROL_PRESSED:
return handleUserControlPressed(message);
+ case Constants.MESSAGE_USER_CONTROL_RELEASED:
+ return handleUserControlReleased();
case Constants.MESSAGE_SET_STREAM_PATH:
return handleSetStreamPath(message);
case Constants.MESSAGE_GIVE_DEVICE_POWER_STATUS:
return handleGiveDevicePowerStatus(message);
+ case Constants.MESSAGE_MENU_REQUEST:
+ return handleGiveDeviceMenuStatus(message);
case Constants.MESSAGE_VENDOR_COMMAND:
return handleVendorCommand(message);
case Constants.MESSAGE_VENDOR_COMMAND_WITH_ID:
@@ -376,6 +394,7 @@
@ServiceThreadOnly
protected boolean handleUserControlPressed(HdmiCecMessage message) {
assertRunOnServiceThread();
+ mHandler.removeMessages(MSG_USER_CONTROL_RELEASE_TIMEOUT);
if (mService.isPowerOnOrTransient() && isPowerOffOrToggleCommand(message)) {
mService.standby();
return true;
@@ -383,9 +402,55 @@
mService.wakeUp();
return true;
}
+
+ final long downTime = SystemClock.uptimeMillis();
+ final byte[] params = message.getParams();
+ // Note that we don't support parameterized keycode now.
+ // TODO: translate parameterized keycode as well.
+ final int keycode = HdmiCecKeycode.cecKeyToAndroidKey(params[0]);
+ int keyRepeatCount = 0;
+ if (mLastKeycode != HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
+ if (keycode == mLastKeycode) {
+ keyRepeatCount = mLastKeyRepeatCount + 1;
+ } else {
+ injectKeyEvent(downTime, KeyEvent.ACTION_UP, mLastKeycode, 0);
+ }
+ }
+ mLastKeycode = keycode;
+ mLastKeyRepeatCount = keyRepeatCount;
+
+ if (keycode != HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
+ injectKeyEvent(downTime, KeyEvent.ACTION_DOWN, keycode, keyRepeatCount);
+ mHandler.sendMessageDelayed(Message.obtain(mHandler, MSG_USER_CONTROL_RELEASE_TIMEOUT),
+ FOLLOWER_SAFETY_TIMEOUT);
+ return true;
+ }
return false;
}
+ @ServiceThreadOnly
+ protected boolean handleUserControlReleased() {
+ assertRunOnServiceThread();
+ mHandler.removeMessages(MSG_USER_CONTROL_RELEASE_TIMEOUT);
+ mLastKeyRepeatCount = 0;
+ if (mLastKeycode != HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
+ final long upTime = SystemClock.uptimeMillis();
+ injectKeyEvent(upTime, KeyEvent.ACTION_UP, mLastKeycode, 0);
+ mLastKeycode = HdmiCecKeycode.UNSUPPORTED_KEYCODE;
+ return true;
+ }
+ return false;
+ }
+
+ static void injectKeyEvent(long time, int action, int keycode, int repeat) {
+ KeyEvent keyEvent = KeyEvent.obtain(time, time, action, keycode,
+ repeat, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FROM_SYSTEM,
+ InputDevice.SOURCE_HDMI, null);
+ InputManager.getInstance().injectInputEvent(keyEvent,
+ InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+ keyEvent.recycle();
+ }
+
static boolean isPowerOnOrToggleCommand(HdmiCecMessage message) {
byte[] params = message.getParams();
return message.getOpcode() == Constants.MESSAGE_USER_CONTROL_PRESSED
@@ -420,6 +485,13 @@
return true;
}
+ protected boolean handleGiveDeviceMenuStatus(HdmiCecMessage message) {
+ // Always report menu active to receive Remote Control.
+ mService.sendCecCommand(HdmiCecMessageBuilder.buildReportMenuStatus(
+ mAddress, message.getSource(), Constants.MENU_STATE_ACTIVATED));
+ return true;
+ }
+
protected boolean handleVendorCommand(HdmiCecMessage message) {
mService.invokeVendorCommandListeners(mDeviceType, message.getSource(),
message.getParams(), false);
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 47b0794..73f5cfd 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -100,7 +100,7 @@
private List<HdmiDeviceInfo> mSafeExternalInputs = Collections.emptyList();
// Map-like container of all cec devices including local ones.
- // A logical address of device is used as key of container.
+ // device id is used as key of container.
// This is not thread-safe. For external purpose use mSafeDeviceInfos.
private final SparseArray<HdmiDeviceInfo> mDeviceInfos = new SparseArray<>();
@@ -167,12 +167,18 @@
/**
* Performs the action 'device select', or 'one touch play' initiated by TV.
*
- * @param targetAddress logical address of the device to select
+ * @param id id of HDMI device to select
* @param callback callback object to report the result with
*/
@ServiceThreadOnly
- void deviceSelect(int targetAddress, IHdmiControlCallback callback) {
+ void deviceSelect(int id, IHdmiControlCallback callback) {
assertRunOnServiceThread();
+ HdmiDeviceInfo targetDevice = mDeviceInfos.get(id);
+ if (targetDevice == null) {
+ invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
+ return;
+ }
+ int targetAddress = targetDevice.getLogicalAddress();
ActiveSource active = getActiveSource();
if (active.isValid() && targetAddress == active.logicalAddress) {
invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS);
@@ -187,18 +193,10 @@
return;
}
if (!mService.isControlEnabled()) {
- HdmiDeviceInfo info = getDeviceInfo(targetAddress);
- if (info != null) {
- setActiveSource(info);
- }
+ setActiveSource(targetDevice);
invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);
return;
}
- HdmiDeviceInfo targetDevice = getDeviceInfo(targetAddress);
- if (targetDevice == null) {
- invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
- return;
- }
removeAction(DeviceSelectAction.class);
addAndStartAction(new DeviceSelectAction(this, targetDevice, callback));
}
@@ -231,7 +229,7 @@
}
setActiveSource(newActive);
int logicalAddress = newActive.logicalAddress;
- if (getDeviceInfo(logicalAddress) != null && logicalAddress != mAddress) {
+ if (getCecDeviceInfo(logicalAddress) != null && logicalAddress != mAddress) {
if (mService.pathToPortId(newActive.physicalAddress) == getActivePortId()) {
setPrevPortId(getActivePortId());
}
@@ -279,7 +277,7 @@
// Show OSD port change banner
if (notifyInputChange) {
ActiveSource activeSource = getActiveSource();
- HdmiDeviceInfo info = getDeviceInfo(activeSource.logicalAddress);
+ HdmiDeviceInfo info = getCecDeviceInfo(activeSource.logicalAddress);
if (info == null) {
info = new HdmiDeviceInfo(Constants.ADDR_INVALID, path, portId,
HdmiDeviceInfo.DEVICE_RESERVED, 0, null);
@@ -363,7 +361,7 @@
assertRunOnServiceThread();
int logicalAddress = message.getSource();
int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());
- if (getDeviceInfo(logicalAddress) == null) {
+ if (getCecDeviceInfo(logicalAddress) == null) {
handleNewDeviceAtTheTailOfActivePath(physicalAddress);
} else {
ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);
@@ -389,7 +387,7 @@
if (portId != Constants.INVALID_PORT_ID) {
// TODO: Do this only if TV is not showing multiview like PIP/PAP.
- HdmiDeviceInfo inactiveSource = getDeviceInfo(message.getSource());
+ HdmiDeviceInfo inactiveSource = getCecDeviceInfo(message.getSource());
if (inactiveSource == null) {
return true;
}
@@ -420,17 +418,25 @@
@ServiceThreadOnly
protected boolean handleGetMenuLanguage(HdmiCecMessage message) {
assertRunOnServiceThread();
- HdmiCecMessage command = HdmiCecMessageBuilder.buildSetMenuLanguageCommand(
- mAddress, Locale.getDefault().getISO3Language());
// TODO: figure out how to handle failed to get language code.
- if (command != null) {
- mService.sendCecCommand(command);
- } else {
+ if (!broadcastMenuLanguage(Locale.getDefault().getISO3Language())) {
Slog.w(TAG, "Failed to respond to <Get Menu Language>: " + message.toString());
}
return true;
}
+ @ServiceThreadOnly
+ boolean broadcastMenuLanguage(String language) {
+ assertRunOnServiceThread();
+ HdmiCecMessage command = HdmiCecMessageBuilder.buildSetMenuLanguageCommand(
+ mAddress, language);
+ if (command != null) {
+ mService.sendCecCommand(command);
+ return true;
+ }
+ return false;
+ }
+
@Override
@ServiceThreadOnly
protected boolean handleReportPhysicalAddress(HdmiCecMessage message) {
@@ -577,7 +583,7 @@
@ServiceThreadOnly
protected boolean handleSetOsdName(HdmiCecMessage message) {
int source = message.getSource();
- HdmiDeviceInfo deviceInfo = getDeviceInfo(source);
+ HdmiDeviceInfo deviceInfo = getCecDeviceInfo(source);
// If the device is not in device list, ignore it.
if (deviceInfo == null) {
Slog.e(TAG, "No source device info for <Set Osd Name>." + message);
@@ -952,11 +958,11 @@
@ServiceThreadOnly
private HdmiDeviceInfo addDeviceInfo(HdmiDeviceInfo deviceInfo) {
assertRunOnServiceThread();
- HdmiDeviceInfo oldDeviceInfo = getDeviceInfo(deviceInfo.getLogicalAddress());
+ HdmiDeviceInfo oldDeviceInfo = getCecDeviceInfo(deviceInfo.getLogicalAddress());
if (oldDeviceInfo != null) {
- removeDeviceInfo(deviceInfo.getLogicalAddress());
+ removeDeviceInfo(deviceInfo.getId());
}
- mDeviceInfos.append(deviceInfo.getLogicalAddress(), deviceInfo);
+ mDeviceInfos.append(deviceInfo.getId(), deviceInfo);
updateSafeDeviceInfoList();
return oldDeviceInfo;
}
@@ -967,15 +973,15 @@
*
* <p>Declared as package-private. accessed by {@link HdmiControlService} only.
*
- * @param logicalAddress logical address of device to be removed
+ * @param id id of device to be removed
* @return removed {@link HdmiDeviceInfo} it exists. Otherwise, returns {@code null}
*/
@ServiceThreadOnly
- private HdmiDeviceInfo removeDeviceInfo(int logicalAddress) {
+ private HdmiDeviceInfo removeDeviceInfo(int id) {
assertRunOnServiceThread();
- HdmiDeviceInfo deviceInfo = mDeviceInfos.get(logicalAddress);
+ HdmiDeviceInfo deviceInfo = mDeviceInfos.get(id);
if (deviceInfo != null) {
- mDeviceInfos.remove(logicalAddress);
+ mDeviceInfos.remove(id);
}
updateSafeDeviceInfoList();
return deviceInfo;
@@ -1008,10 +1014,8 @@
/**
* Return external input devices.
*/
- List<HdmiDeviceInfo> getSafeExternalInputs() {
- synchronized (mLock) {
- return mSafeExternalInputs;
- }
+ List<HdmiDeviceInfo> getSafeExternalInputsLocked() {
+ return mSafeExternalInputs;
}
@ServiceThreadOnly
@@ -1035,7 +1039,7 @@
ArrayList<HdmiDeviceInfo> infoList = new ArrayList<>();
for (int i = 0; i < mDeviceInfos.size(); ++i) {
HdmiDeviceInfo info = mDeviceInfos.valueAt(i);
- if (isLocalDeviceAddress(i)) {
+ if (isLocalDeviceAddress(info.getLogicalAddress())) {
continue;
}
if (info.isSourceType() && !hideDevicesBehindLegacySwitch(info)) {
@@ -1095,23 +1099,22 @@
@ServiceThreadOnly
HdmiDeviceInfo getAvrDeviceInfo() {
assertRunOnServiceThread();
- return getDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
+ return getCecDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
}
/**
* Return a {@link HdmiDeviceInfo} corresponding to the given {@code logicalAddress}.
*
- * <p>Declared as package-private. accessed by {@link HdmiControlService} only.
- * This is not thread-safe. For thread safety, call {@link #getSafeDeviceInfo(int)}.
+ * This is not thread-safe. For thread safety, call {@link #getSafeCecDeviceInfo(int)}.
*
- * @param logicalAddress logical address to be retrieved
+ * @param address logical address of the device to be retrieved
* @return {@link HdmiDeviceInfo} matched with the given {@code logicalAddress}.
* Returns null if no logical address matched
*/
@ServiceThreadOnly
- HdmiDeviceInfo getDeviceInfo(int logicalAddress) {
+ HdmiDeviceInfo getCecDeviceInfo(int logicalAddress) {
assertRunOnServiceThread();
- return mDeviceInfos.get(logicalAddress);
+ return mDeviceInfos.get(HdmiDeviceInfo.idForCecDevice(logicalAddress));
}
boolean hasSystemAudioDevice() {
@@ -1119,19 +1122,24 @@
}
HdmiDeviceInfo getSafeAvrDeviceInfo() {
- return getSafeDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
+ return getSafeCecDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
}
/**
- * Thread safe version of {@link #getDeviceInfo(int)}.
+ * Thread safe version of {@link #getCecDeviceInfo(int)}.
*
* @param logicalAddress logical address to be retrieved
* @return {@link HdmiDeviceInfo} matched with the given {@code logicalAddress}.
* Returns null if no logical address matched
*/
- HdmiDeviceInfo getSafeDeviceInfo(int logicalAddress) {
+ HdmiDeviceInfo getSafeCecDeviceInfo(int logicalAddress) {
synchronized (mLock) {
- return mSafeAllDeviceInfos.get(logicalAddress);
+ for (HdmiDeviceInfo info : mSafeAllDeviceInfos) {
+ if (info.isCecDevice() && info.getLogicalAddress() == logicalAddress) {
+ return info;
+ }
+ }
+ return null;
}
}
@@ -1160,7 +1168,7 @@
@ServiceThreadOnly
final void removeCecDevice(int address) {
assertRunOnServiceThread();
- HdmiDeviceInfo info = removeDeviceInfo(address);
+ HdmiDeviceInfo info = removeDeviceInfo(HdmiDeviceInfo.idForCecDevice(address));
mCecMessageCache.flushMessagesFrom(address);
invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE);
@@ -1240,7 +1248,7 @@
@ServiceThreadOnly
boolean isInDeviceList(int logicalAddress, int physicalAddress) {
assertRunOnServiceThread();
- HdmiDeviceInfo device = getDeviceInfo(logicalAddress);
+ HdmiDeviceInfo device = getCecDeviceInfo(logicalAddress);
if (device == null) {
return false;
}
@@ -1427,7 +1435,7 @@
}
private boolean checkRecorder(int recorderAddress) {
- HdmiDeviceInfo device = getDeviceInfo(recorderAddress);
+ HdmiDeviceInfo device = getCecDeviceInfo(recorderAddress);
return (device != null)
&& (HdmiUtils.getTypeFromAddress(recorderAddress)
== HdmiDeviceInfo.DEVICE_RECORDER);
@@ -1528,7 +1536,7 @@
}
void updateDevicePowerStatus(int logicalAddress, int newPowerStatus) {
- HdmiDeviceInfo info = getDeviceInfo(logicalAddress);
+ HdmiDeviceInfo info = getCecDeviceInfo(logicalAddress);
if (info == null) {
Slog.w(TAG, "Can not update power status of non-existing device:" + logicalAddress);
return;
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
index 0855bfa..b53cd45 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageBuilder.java
@@ -338,6 +338,21 @@
}
/**
+ * Build <Report Menu Status> command.
+ *
+ * @param src source address of command
+ * @param dest destination address of command
+ * @param menuStatus menu status of the device
+ * @return newly created {@link HdmiCecMessage}
+ */
+ static HdmiCecMessage buildReportMenuStatus(int src, int dest, int menuStatus) {
+ byte[] param = new byte[] {
+ (byte) (menuStatus)
+ };
+ return buildCommand(src, dest, Constants.MESSAGE_MENU_STATUS, param);
+ }
+
+ /**
* Build <System Audio Mode Request> command.
*
* @param src source address of command
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 0e57afd..5b99f14 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -16,6 +16,8 @@
package com.android.server.hdmi;
+import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_ADD_DEVICE;
+import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE;
import static com.android.server.hdmi.Constants.DISABLED;
import static com.android.server.hdmi.Constants.ENABLED;
import static com.android.server.hdmi.Constants.OPTION_CEC_AUTO_WAKEUP;
@@ -76,6 +78,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
/**
* Provides a service for sending and processing HDMI control messages,
@@ -121,7 +124,7 @@
void onPollingFinished(List<Integer> ackedAddress);
}
- private class PowerStateReceiver extends BroadcastReceiver {
+ private class HdmiControlBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) {
@@ -135,6 +138,12 @@
onWakeUp();
}
break;
+ case Intent.ACTION_CONFIGURATION_CHANGED:
+ String language = Locale.getDefault().getISO3Language();
+ if (!mLanguage.equals(language)) {
+ onLanguageChanged(language);
+ }
+ break;
}
}
}
@@ -198,6 +207,13 @@
@GuardedBy("mLock")
private boolean mProhibitMode;
+ // Set to true while the input change by MHL is allowed.
+ @GuardedBy("mLock")
+ private boolean mMhlInputChangeEnabled;
+
+ @GuardedBy("mLock")
+ private List<HdmiDeviceInfo> mMhlDevices;
+
// List of listeners registered by callers that want to get notified of
// system audio mode changes.
private final ArrayList<IHdmiSystemAudioModeChangeListener>
@@ -229,12 +245,16 @@
private HdmiCecMessageValidator mMessageValidator;
- private final PowerStateReceiver mPowerStateReceiver = new PowerStateReceiver();
+ private final HdmiControlBroadcastReceiver
+ mHdmiControlBroadcastReceiver = new HdmiControlBroadcastReceiver();
@ServiceThreadOnly
private int mPowerStatus = HdmiControlManager.POWER_STATUS_STANDBY;
@ServiceThreadOnly
+ private String mLanguage = Locale.getDefault().getISO3Language();
+
+ @ServiceThreadOnly
private boolean mStandbyMessageReceived = false;
@ServiceThreadOnly
@@ -269,6 +289,7 @@
mPowerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_ON;
mProhibitMode = false;
mHdmiControlEnabled = readBooleanSetting(Global.HDMI_CONTROL_ENABLED, true);
+ mMhlInputChangeEnabled = readBooleanSetting(Global.MHL_INPUT_SWITCHING_ENABLED, true);
mCecController = HdmiCecController.create(this);
if (mCecController != null) {
@@ -288,6 +309,7 @@
Slog.i(TAG, "Device does not support MHL-control.");
}
initPortInfo();
+ mMhlDevices = Collections.emptyList();
mMessageValidator = new HdmiCecMessageValidator(this);
publishBinderService(Context.HDMI_CONTROL_SERVICE, new BinderService());
@@ -296,7 +318,8 @@
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_OFF);
filter.addAction(Intent.ACTION_SCREEN_ON);
- getContext().registerReceiver(mPowerStateReceiver, filter);
+ filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
+ getContext().registerReceiver(mHdmiControlBroadcastReceiver, filter);
}
}
@@ -315,7 +338,6 @@
}
}
-
private void registerContentObserver() {
ContentResolver resolver = getContext().getContentResolver();
String[] settings = new String[] {
@@ -325,7 +347,7 @@
Global.MHL_INPUT_SWITCHING_ENABLED,
Global.MHL_POWER_CHARGE_ENABLED
};
- for (String s: settings) {
+ for (String s : settings) {
resolver.registerContentObserver(Global.getUriFor(s), false, mSettingsObserver,
UserHandle.USER_ALL);
}
@@ -346,17 +368,19 @@
break;
case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED:
tv().setAutoWakeup(enabled);
- setOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
+ setCecOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
break;
case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:
tv().setAutoDeviceOff(enabled);
// No need to propagate to HAL.
break;
case Global.MHL_INPUT_SWITCHING_ENABLED:
- setOption(OPTION_MHL_INPUT_SWITCHING, toInt(enabled));
+ setMhlInputChangeEnabled(enabled);
break;
case Global.MHL_POWER_CHARGE_ENABLED:
- setOption(OPTION_MHL_POWER_CHARGE, toInt(enabled));
+ if (mMhlController != null) {
+ mMhlController.setOption(OPTION_MHL_POWER_CHARGE, toInt(enabled));
+ }
break;
}
}
@@ -483,6 +507,10 @@
}
}
+ List<HdmiPortInfo> getPortInfo() {
+ return mPortInfo;
+ }
+
/**
* Returns HDMI port information for the given port id.
*
@@ -561,7 +589,7 @@
if (tv == null) {
return null;
}
- return tv.getDeviceInfo(logicalAddress);
+ return tv.getCecDeviceInfo(logicalAddress);
}
/**
@@ -677,16 +705,16 @@
/**
* Called when a new hotplug event is issued.
*
- * @param portNo hdmi port number where hot plug event issued.
+ * @param portId hdmi port number where hot plug event issued.
* @param connected whether to be plugged in or not
*/
@ServiceThreadOnly
- void onHotplug(int portNo, boolean connected) {
+ void onHotplug(int portId, boolean connected) {
assertRunOnServiceThread();
for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
- device.onHotplug(portNo, connected);
+ device.onHotplug(portId, connected);
}
- announceHotplugEvent(portNo, connected);
+ announceHotplugEvent(portId, connected);
}
/**
@@ -787,10 +815,15 @@
HdmiMhlLocalDevice device = mMhlController.removeLocalDevice(portId);
if (device != null) {
device.onDeviceRemoved();
+ // There is no explicit event for device removal unlike capability register event
+ // used for device addition . Hence we remove the device on hotplug event.
+ invokeDeviceEventListeners(device.getInfo(), DEVICE_EVENT_REMOVE_DEVICE);
+ updateSafeMhlInput();
} else {
Slog.w(TAG, "No device to remove:[portId=" + portId);
}
}
+ announceHotplugEvent(portId, connected);
}
@ServiceThreadOnly
@@ -817,18 +850,45 @@
}
@ServiceThreadOnly
- void handleCapabilityRegisterChanged(int portId, int adopterId, int deviceId) {
+ void handleMhlCapabilityRegisterChanged(int portId, int adopterId, int deviceId) {
assertRunOnServiceThread();
HdmiMhlLocalDevice device = mMhlController.getLocalDevice(portId);
- // Hot plug event should be called before capability register change event.
+
+ // Hotplug event should already have been called before capability register change event.
if (device != null) {
device.setCapabilityRegister(adopterId, deviceId);
+ invokeDeviceEventListeners(device.getInfo(), DEVICE_EVENT_ADD_DEVICE);
+ updateSafeMhlInput();
} else {
Slog.w(TAG, "No mhl device exists for capability register change event[portId:"
+ portId + ", adopterId:" + adopterId + ", deviceId:" + deviceId + "]");
}
}
+ @ServiceThreadOnly
+ private void updateSafeMhlInput() {
+ assertRunOnServiceThread();
+ List<HdmiDeviceInfo> inputs = Collections.emptyList();
+ SparseArray<HdmiMhlLocalDevice> devices = mMhlController.getAllLocalDevices();
+ for (int i = 0; i < devices.size(); ++i) {
+ HdmiMhlLocalDevice device = devices.valueAt(i);
+ HdmiDeviceInfo info = device.getInfo();
+ if (info != null) {
+ if (inputs.isEmpty()) {
+ inputs = new ArrayList<>();
+ }
+ inputs.add(device.getInfo());
+ }
+ }
+ synchronized (mLock) {
+ mMhlDevices = inputs;
+ }
+ }
+
+ private List<HdmiDeviceInfo> getMhlDevicesLocked() {
+ return mMhlDevices;
+ }
+
// Record class that monitors the event of the caller of being killed. Used to clean up
// the listener list and record list accordingly.
private final class HotplugEventListenerRecord implements IBinder.DeathRecipient {
@@ -942,7 +1002,7 @@
}
@Override
- public void deviceSelect(final int logicalAddress, final IHdmiControlCallback callback) {
+ public void deviceSelect(final int deviceId, final IHdmiControlCallback callback) {
enforceAccessPermission();
runOnServiceThread(new Runnable() {
@Override
@@ -957,7 +1017,18 @@
invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE);
return;
}
- tv.deviceSelect(logicalAddress, callback);
+ if (mMhlController != null) {
+ HdmiMhlLocalDevice device = mMhlController.getLocalDeviceById(deviceId);
+ if (device != null) {
+ // Upon selecting MHL device, we send RAP[Content On] to wake up
+ // the connected mobile device, start routing control to switch ports.
+ // callback is handled by MHL action.
+ device.turnOn(callback);
+ tv.doManualPortSwitching(device.getInfo().getPortId(), null);
+ return;
+ }
+ }
+ tv.deviceSelect(deviceId, callback);
}
});
}
@@ -989,12 +1060,21 @@
runOnServiceThread(new Runnable() {
@Override
public void run() {
- HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(deviceType);
- if (localDevice == null) {
- Slog.w(TAG, "Local device not available");
- return;
+ if (mMhlController != null) {
+ HdmiMhlLocalDevice device = mMhlController.getLocalDevice(mActivePortId);
+ if (device != null) {
+ device.sendKeyEvent(keyCode, isPressed);
+ return;
+ }
}
- localDevice.sendKeyEvent(keyCode, isPressed);
+ if (mCecController != null) {
+ HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(deviceType);
+ if (localDevice == null) {
+ Slog.w(TAG, "Local device not available");
+ return;
+ }
+ localDevice.sendKeyEvent(keyCode, isPressed);
+ }
}
});
}
@@ -1057,7 +1137,7 @@
@Override
public List<HdmiPortInfo> getPortInfo() {
enforceAccessPermission();
- return mPortInfo;
+ return HdmiControlService.this.getPortInfo();
}
@Override
@@ -1123,10 +1203,12 @@
// No need to hold the lock for obtaining TV device as the local device instance
// is preserved while the HDMI control is enabled.
HdmiCecLocalDeviceTv tv = tv();
- if (tv == null) {
- return Collections.emptyList();
+ synchronized (mLock) {
+ List<HdmiDeviceInfo> cecDevices = (tv == null)
+ ? Collections.<HdmiDeviceInfo>emptyList()
+ : tv.getSafeExternalInputsLocked();
+ return HdmiUtils.mergeToUnmodifiableList(cecDevices, getMhlDevicesLocked());
}
- return tv.getSafeExternalInputs();
}
@Override
@@ -1578,7 +1660,7 @@
assertRunOnServiceThread();
mStandbyMessageReceived = true;
PowerManager pm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
- pm.goToSleep(SystemClock.uptimeMillis());
+ pm.goToSleep(SystemClock.uptimeMillis(), PowerManager.GO_TO_SLEEP_REASON_HDMI, 0);
// PowerManger will send the broadcast Intent.ACTION_SCREEN_OFF and after this gets
// the intent, the sequence will continue at onStandby().
}
@@ -1627,12 +1709,28 @@
});
}
- private void disableDevices(PendingActionClearedCallback callback) {
- for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
- device.disableDevice(mStandbyMessageReceived, callback);
- }
+ @ServiceThreadOnly
+ private void onLanguageChanged(String language) {
+ assertRunOnServiceThread();
+ mLanguage = language;
+
if (isTvDevice()) {
- unregisterSettingsObserver();
+ tv().broadcastMenuLanguage(language);
+ }
+ }
+
+ private void disableDevices(PendingActionClearedCallback callback) {
+ if (mCecController != null) {
+ for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
+ device.disableDevice(mStandbyMessageReceived, callback);
+ }
+ if (isTvDevice()) {
+ unregisterSettingsObserver();
+ }
+ }
+
+ if (mMhlController != null) {
+ mMhlController.clearAllLocalDevices();
}
}
@@ -1704,7 +1802,7 @@
}
@ServiceThreadOnly
- void setOption(int key, int value) {
+ void setCecOption(int key, int value) {
assertRunOnServiceThread();
mCecController.setOption(key, value);
}
@@ -1741,4 +1839,20 @@
assertRunOnServiceThread();
mActivePortId = portId;
}
+
+ void setMhlInputChangeEnabled(boolean enabled) {
+ if (mMhlController != null) {
+ mMhlController.setOption(OPTION_MHL_INPUT_SWITCHING, toInt(enabled));
+ }
+
+ synchronized (mLock) {
+ mMhlInputChangeEnabled = enabled;
+ }
+ }
+
+ boolean isMhlInputChangeEnabled() {
+ synchronized (mLock) {
+ return mMhlInputChangeEnabled;
+ }
+ }
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiUtils.java b/services/core/java/com/android/server/hdmi/HdmiUtils.java
index 23f19ff..22a519b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiUtils.java
+++ b/services/core/java/com/android/server/hdmi/HdmiUtils.java
@@ -206,6 +206,22 @@
return list;
}
+ static <T> List<T> mergeToUnmodifiableList(List<T> a, List<T> b) {
+ if (a.isEmpty() && b.isEmpty()) {
+ return Collections.emptyList();
+ }
+ if (a.isEmpty()) {
+ return Collections.unmodifiableList(b);
+ }
+ if (b.isEmpty()) {
+ return Collections.unmodifiableList(a);
+ }
+ List<T> newList = new ArrayList<>();
+ newList.addAll(a);
+ newList.addAll(b);
+ return Collections.unmodifiableList(newList);
+ }
+
/**
* See if the new path is affecting the active path.
*
diff --git a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
index 51e68b6..722be71 100644
--- a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
+++ b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
@@ -207,7 +207,7 @@
}
private void mayChangeRoutingPath(int address) {
- HdmiDeviceInfo info = tv().getDeviceInfo(address);
+ HdmiDeviceInfo info = tv().getCecDeviceInfo(address);
if (info != null) {
tv().handleRemoveActiveRoutingPath(info.getPhysicalAddress());
}
diff --git a/services/core/java/com/android/server/hdmi/SendKeyAction.java b/services/core/java/com/android/server/hdmi/SendKeyAction.java
index 9f09eb4..ed978e0 100644
--- a/services/core/java/com/android/server/hdmi/SendKeyAction.java
+++ b/services/core/java/com/android/server/hdmi/SendKeyAction.java
@@ -109,12 +109,12 @@
}
private void sendKeyDown(int keycode) {
- byte[] keycodeAndParam = getCecKeycodeAndParam(keycode);
- if (keycodeAndParam == null) {
+ int cecKeycode = HdmiCecKeycode.androidKeyToCecKey(keycode);
+ if (cecKeycode == HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
return;
}
sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),
- mTargetAddress, keycodeAndParam));
+ mTargetAddress, new byte[] { (byte) (cecKeycode & 0xFF) }));
}
private void sendKeyUp() {
@@ -141,13 +141,4 @@
sendKeyDown(mLastKeycode);
addTimer(mState, IRT_MS);
}
-
- // Converts the Android key code to corresponding CEC key code definition. Those CEC keys
- // with additional parameters should be mapped from individual Android key code. 'Select
- // Broadcast' with the parameter 'cable', for instance, shall have its counterpart such as
- // KeyEvent.KEYCODE_TV_BROADCAST_CABLE.
- // The return byte array contains both UI command (keycode) and optional parameter.
- private byte[] getCecKeycodeAndParam(int keycode) {
- return HdmiCecKeycode.androidKeyToCecKey(keycode);
- }
}
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 7c1681c..93dceff 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -774,6 +774,8 @@
.setContentIntent(mKeyboardLayoutIntent)
.setSmallIcon(R.drawable.ic_settings_language)
.setPriority(Notification.PRIORITY_LOW)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color))
.build();
mNotificationManager.notifyAsUser(null,
R.string.select_keyboard_layout_notification_title,
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
index 94cf668..9dcc529 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -23,6 +23,7 @@
import android.os.Handler;
import android.os.IHardwareService;
import android.os.Message;
+import android.os.Trace;
import android.util.Slog;
import java.io.FileInputStream;
@@ -105,7 +106,12 @@
mMode = mode;
mOnMS = onMS;
mOffMS = offMS;
- setLight_native(mNativePointer, mId, color, mode, onMS, offMS, brightnessMode);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "setLight(" + mId + ", " + color + ")");
+ try {
+ setLight_native(mNativePointer, mId, color, mode, onMS, offMS, brightnessMode);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
}
}
diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java
index 201d9b4..753ae39 100644
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -1372,6 +1372,7 @@
switch (status) {
case GPS_REQUEST_AGPS_DATA_CONN:
if (DEBUG) Log.d(TAG, "GPS_REQUEST_AGPS_DATA_CONN");
+ Log.v(TAG, "Received SUPL IP addr[]: " + ipaddr);
// Set mAGpsDataConnectionState before calling startUsingNetworkFeature
// to avoid a race condition with handleUpdateNetworkState()
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;
@@ -1380,6 +1381,7 @@
if (ipaddr != null) {
try {
mAGpsDataConnectionIpAddr = InetAddress.getByAddress(ipaddr);
+ Log.v(TAG, "IP address converted to: " + mAGpsDataConnectionIpAddr);
} catch (UnknownHostException e) {
Log.e(TAG, "Bad IP Address: " + ipaddr, e);
mAGpsDataConnectionIpAddr = null;
@@ -1426,6 +1428,8 @@
case GPS_AGPS_DATA_CONN_FAILED:
if (DEBUG) Log.d(TAG, "GPS_AGPS_DATA_CONN_FAILED");
break;
+ default:
+ Log.d(TAG, "Received Unknown AGPS status: " + status);
}
}
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index e549ead..978a9f4 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -22,17 +22,16 @@
import android.content.Intent;
import android.content.pm.ParceledListSlice;
import android.media.AudioManager;
+import android.media.AudioManagerInternal;
import android.media.MediaMetadata;
import android.media.Rating;
import android.media.VolumeProvider;
-import android.media.routing.IMediaRouter;
-import android.media.routing.IMediaRouterDelegate;
-import android.media.routing.IMediaRouterStateCallback;
import android.media.session.ISession;
import android.media.session.ISessionCallback;
import android.media.session.ISessionController;
import android.media.session.ISessionControllerCallback;
import android.media.session.MediaController;
+import android.media.session.MediaController.PlaybackInfo;
import android.media.session.MediaSession;
import android.media.session.ParcelableVolumeInfo;
import android.media.session.PlaybackState;
@@ -52,6 +51,8 @@
import android.util.Slog;
import android.view.KeyEvent;
+import com.android.server.LocalServices;
+
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.UUID;
@@ -93,7 +94,6 @@
new ArrayList<ISessionControllerCallback>();
private long mFlags;
- private IMediaRouter mMediaRouter;
private PendingIntent mMediaButtonReceiver;
private PendingIntent mLaunchIntent;
@@ -111,7 +111,8 @@
// Volume handling fields
private AudioAttributes mAudioAttrs;
private AudioManager mAudioManager;
- private int mVolumeType = MediaSession.PLAYBACK_TYPE_LOCAL;
+ private AudioManagerInternal mAudioManagerInternal;
+ private int mVolumeType = PlaybackInfo.PLAYBACK_TYPE_LOCAL;
private int mVolumeControlType = VolumeProvider.VOLUME_CONTROL_ABSOLUTE;
private int mMaxVolume = 0;
private int mCurrentVolume = 0;
@@ -134,6 +135,7 @@
mService = service;
mHandler = new MessageHandler(handler.getLooper());
mAudioManager = (AudioManager) service.getContext().getSystemService(Context.AUDIO_SERVICE);
+ mAudioManagerInternal = LocalServices.getService(AudioManagerInternal.class);
mAudioAttrs = new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build();
}
@@ -227,7 +229,7 @@
*
* @param direction The direction to adjust volume in.
*/
- public void adjustVolume(int direction, int flags) {
+ public void adjustVolume(int direction, int flags, String packageName, int uid) {
if (isPlaybackActive(false)) {
flags &= ~AudioManager.FLAG_PLAY_SOUND;
}
@@ -236,9 +238,10 @@
} else if (direction < -1) {
direction = -1;
}
- if (mVolumeType == MediaSession.PLAYBACK_TYPE_LOCAL) {
+ if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
- mAudioManager.adjustStreamVolume(stream, direction, flags);
+ mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags, packageName,
+ uid);
} else {
if (mVolumeControlType == VolumeProvider.VOLUME_CONTROL_FIXED) {
// Nothing to do, the volume cannot be changed
@@ -262,10 +265,10 @@
}
}
- public void setVolumeTo(int value, int flags) {
- if (mVolumeType == MediaSession.PLAYBACK_TYPE_LOCAL) {
+ public void setVolumeTo(int value, int flags, String packageName, int uid) {
+ if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
- mAudioManager.setStreamVolume(stream, value, flags);
+ mAudioManagerInternal.setStreamVolumeForUid(stream, value, flags, packageName, uid);
} else {
if (mVolumeControlType != VolumeProvider.VOLUME_CONTROL_ABSOLUTE) {
// Nothing to do. The volume can't be set directly.
@@ -397,6 +400,7 @@
return;
}
mDestroyed = true;
+ mHandler.post(MessageHandler.MSG_DESTROYED);
}
}
@@ -575,6 +579,29 @@
}
}
+ private void pushSessionDestroyed() {
+ synchronized (mLock) {
+ // This is the only method that may be (and can only be) called
+ // after the session is destroyed.
+ if (!mDestroyed) {
+ return;
+ }
+ for (int i = mControllerCallbacks.size() - 1; i >= 0; i--) {
+ ISessionControllerCallback cb = mControllerCallbacks.get(i);
+ try {
+ cb.onSessionDestroyed();
+ } catch (DeadObjectException e) {
+ Log.w(TAG, "Removing dead callback in pushEvent.", e);
+ mControllerCallbacks.remove(i);
+ } catch (RemoteException e) {
+ Log.w(TAG, "unexpected exception in pushEvent.", e);
+ }
+ }
+ // After notifying clear all listeners
+ mControllerCallbacks.clear();
+ }
+ }
+
private PlaybackState getStateWithUpdatedPosition() {
PlaybackState state = mPlaybackState;
long duration = -1;
@@ -662,12 +689,6 @@
}
@Override
- public void setMediaRouter(IMediaRouter router) {
- mMediaRouter = router;
- mHandler.post(MessageHandler.MSG_UPDATE_SESSION_STATE);
- }
-
- @Override
public void setMediaButtonReceiver(PendingIntent pi) {
mMediaButtonReceiver = pi;
}
@@ -728,8 +749,8 @@
public void setPlaybackToLocal(AudioAttributes attributes) {
boolean typeChanged;
synchronized (mLock) {
- typeChanged = mVolumeType == MediaSession.PLAYBACK_TYPE_REMOTE;
- mVolumeType = MediaSession.PLAYBACK_TYPE_LOCAL;
+ typeChanged = mVolumeType == PlaybackInfo.PLAYBACK_TYPE_REMOTE;
+ mVolumeType = PlaybackInfo.PLAYBACK_TYPE_LOCAL;
if (attributes != null) {
mAudioAttrs = attributes;
} else {
@@ -745,8 +766,8 @@
public void setPlaybackToRemote(int control, int max) {
boolean typeChanged;
synchronized (mLock) {
- typeChanged = mVolumeType == MediaSession.PLAYBACK_TYPE_LOCAL;
- mVolumeType = MediaSession.PLAYBACK_TYPE_REMOTE;
+ typeChanged = mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL;
+ mVolumeType = PlaybackInfo.PLAYBACK_TYPE_REMOTE;
mVolumeControlType = control;
mMaxVolume = max;
}
@@ -919,6 +940,16 @@
@Override
public void registerCallbackListener(ISessionControllerCallback cb) {
synchronized (mLock) {
+ // If this session is already destroyed tell the caller and
+ // don't add them.
+ if (mDestroyed) {
+ try {
+ cb.onSessionDestroyed();
+ } catch (Exception e) {
+ // ignored
+ }
+ return;
+ }
if (getControllerCbIndexForCb(cb) < 0) {
mControllerCallbacks.add(cb);
if (DEBUG) {
@@ -968,7 +999,7 @@
int type;
int max;
int current;
- if (mVolumeType == MediaSession.PLAYBACK_TYPE_REMOTE) {
+ if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
type = mVolumeControlType;
max = mMaxVolume;
current = mOptimisticVolume != -1 ? mOptimisticVolume
@@ -984,20 +1015,22 @@
}
@Override
- public void adjustVolume(int direction, int flags) {
+ public void adjustVolume(int direction, int flags, String packageName) {
+ int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
- MediaSessionRecord.this.adjustVolume(direction, flags);
+ MediaSessionRecord.this.adjustVolume(direction, flags, packageName, uid);
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override
- public void setVolumeTo(int value, int flags) {
+ public void setVolumeTo(int value, int flags, String packageName) {
+ int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
- MediaSessionRecord.this.setVolumeTo(value, flags);
+ MediaSessionRecord.this.setVolumeTo(value, flags, packageName, uid);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -1105,13 +1138,6 @@
public boolean isTransportControlEnabled() {
return MediaSessionRecord.this.isTransportControlEnabled();
}
-
- @Override
- public IMediaRouterDelegate createMediaRouterDelegate(
- IMediaRouterStateCallback callback) {
- // todo
- return null;
- }
}
private class MessageHandler extends Handler {
@@ -1123,6 +1149,7 @@
private static final int MSG_SEND_EVENT = 6;
private static final int MSG_UPDATE_SESSION_STATE = 7;
private static final int MSG_UPDATE_VOLUME = 8;
+ private static final int MSG_DESTROYED = 9;
public MessageHandler(Looper looper) {
super(looper);
@@ -1154,6 +1181,8 @@
case MSG_UPDATE_VOLUME:
pushVolumeUpdate();
break;
+ case MSG_DESTROYED:
+ pushSessionDestroyed();
}
}
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 0514f48..0c6d46c 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -37,6 +37,7 @@
import android.media.session.ISession;
import android.media.session.ISessionCallback;
import android.media.session.ISessionManager;
+import android.media.session.MediaController.PlaybackInfo;
import android.media.session.MediaSession;
import android.net.Uri;
import android.os.Binder;
@@ -812,8 +813,9 @@
Log.e(TAG, "Error adjusting default volume.", e);
}
} else {
- session.adjustVolume(direction, flags);
- if (session.getPlaybackType() == MediaSession.PLAYBACK_TYPE_REMOTE
+ session.adjustVolume(direction, flags, getContext().getPackageName(),
+ UserHandle.myUserId());
+ if (session.getPlaybackType() == PlaybackInfo.PLAYBACK_TYPE_REMOTE
&& mRvc != null) {
try {
mRvc.remoteVolumeChanged(session.getControllerBinder(), flags);
diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index fec11fba..a9bc818 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -16,6 +16,7 @@
package com.android.server.media;
+import android.media.session.MediaController.PlaybackInfo;
import android.media.session.PlaybackState;
import android.media.session.MediaSession;
import android.os.UserHandle;
@@ -209,7 +210,7 @@
int size = records.size();
for (int i = 0; i < size; i++) {
MediaSessionRecord record = records.get(i);
- if (record.getPlaybackType() == MediaSession.PLAYBACK_TYPE_REMOTE) {
+ if (record.getPlaybackType() == PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
return record;
}
}
diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
index 289b5aa..69d1dc9 100644
--- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
+++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
@@ -26,6 +26,8 @@
import android.media.projection.IMediaProjectionManager;
import android.media.projection.IMediaProjection;
import android.media.projection.IMediaProjectionCallback;
+import android.media.projection.IMediaProjectionWatcherCallback;
+import android.media.projection.MediaProjectionInfo;
import android.media.projection.MediaProjectionManager;
import android.os.Binder;
import android.os.Handler;
@@ -34,6 +36,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.Slog;
@@ -59,15 +62,20 @@
private static final String TAG = "MediaProjectionManagerService";
private final Object mLock = new Object(); // Protects the list of media projections
- private final Map<IBinder, MediaProjection> mProjectionGrants;
+ private final Map<IBinder, IBinder.DeathRecipient> mDeathEaters;
+ private final CallbackDelegate mCallbackDelegate;
private final Context mContext;
private final AppOpsManager mAppOps;
+ private IBinder mProjectionToken;
+ private MediaProjection mProjectionGrant;
+
public MediaProjectionManagerService(Context context) {
super(context);
mContext = context;
- mProjectionGrants = new ArrayMap<IBinder, MediaProjection>();
+ mDeathEaters = new ArrayMap<IBinder, IBinder.DeathRecipient>();
+ mCallbackDelegate = new CallbackDelegate();
mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
Watchdog.getInstance().addMonitor(this);
}
@@ -83,13 +91,97 @@
synchronized (mLock) { /* check for deadlock */ }
}
+ private void startProjectionLocked(final MediaProjection projection) {
+ if (mProjectionGrant != null) {
+ mProjectionGrant.stop();
+ }
+ mProjectionToken = projection.asBinder();
+ mProjectionGrant = projection;
+ dispatchStart(projection);
+ }
+
+ private void stopProjectionLocked(final MediaProjection projection) {
+ mProjectionToken = null;
+ mProjectionGrant = null;
+ dispatchStop(projection);
+ }
+
+ private void addCallback(final IMediaProjectionWatcherCallback callback) {
+ IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() {
+ @Override
+ public void binderDied() {
+ synchronized (mLock) {
+ unlinkDeathRecipientLocked(callback);
+ removeCallback(callback);
+ }
+ }
+ };
+ synchronized (mLock) {
+ mCallbackDelegate.add(callback);
+ linkDeathRecipientLocked(callback, deathRecipient);
+ }
+ }
+
+ private void removeCallback(IMediaProjectionWatcherCallback callback) {
+ synchronized (mLock) {
+ unlinkDeathRecipientLocked(callback);
+ removeCallback(callback);
+ }
+ }
+
+ private void linkDeathRecipientLocked(IMediaProjectionWatcherCallback callback,
+ IBinder.DeathRecipient deathRecipient) {
+ try {
+ final IBinder token = callback.asBinder();
+ token.linkToDeath(deathRecipient, 0);
+ mDeathEaters.put(token, deathRecipient);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Unable to link to death for media projection monitoring callback", e);
+ }
+ }
+
+ private void unlinkDeathRecipientLocked(IMediaProjectionWatcherCallback callback) {
+ final IBinder token = callback.asBinder();
+ IBinder.DeathRecipient deathRecipient = mDeathEaters.remove(token);
+ if (deathRecipient != null) {
+ token.unlinkToDeath(deathRecipient, 0);
+ }
+ }
+
+ private void dispatchStart(MediaProjection projection) {
+ mCallbackDelegate.dispatchStart(projection);
+ }
+
+ private void dispatchStop(MediaProjection projection) {
+ mCallbackDelegate.dispatchStop(projection);
+ }
+
+ private boolean isValidMediaProjection(IBinder token) {
+ synchronized (mLock) {
+ if (mProjectionToken != null) {
+ return mProjectionToken.equals(token);
+ }
+ return false;
+ }
+ }
+
+ private MediaProjectionInfo getActiveProjectionInfo() {
+ synchronized (mLock) {
+ if (mProjectionGrant == null) {
+ return null;
+ }
+ return mProjectionGrant.getProjectionInfo();
+ }
+ }
+
private void dump(final PrintWriter pw) {
pw.println("MEDIA PROJECTION MANAGER (dumpsys media_projection)");
synchronized (mLock) {
- Collection<MediaProjection> projections = mProjectionGrants.values();
- pw.println("Media Projections: size=" + projections.size());
- for (MediaProjection mp : projections) {
- mp.dump(pw, " ");
+ pw.println("Media Projection: ");
+ if (mProjectionGrant != null ) {
+ mProjectionGrant.dump(pw);
+ } else {
+ pw.println("null");
}
}
}
@@ -115,11 +207,14 @@
@Override // Binder call
public IMediaProjection createProjection(int uid, String packageName, int type,
boolean isPermanentGrant) {
- if (mContext.checkCallingPermission(Manifest.permission.CREATE_MEDIA_PROJECTION)
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
!= PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires CREATE_MEDIA_PROJECTION in order to grant "
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to grant "
+ "projection permission");
}
+ if (packageName == null || packageName.isEmpty()) {
+ throw new IllegalArgumentException("package name must not be empty");
+ }
long callingToken = Binder.clearCallingIdentity();
MediaProjection projection;
try {
@@ -136,7 +231,71 @@
@Override // Binder call
public boolean isValidMediaProjection(IMediaProjection projection) {
- return mProjectionGrants.containsKey(projection.asBinder());
+ return MediaProjectionManagerService.this.isValidMediaProjection(
+ projection.asBinder());
+ }
+
+ @Override // Binder call
+ public MediaProjectionInfo getActiveProjectionInfo() {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ return MediaProjectionManagerService.this.getActiveProjectionInfo();
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override // Binder call
+ public void stopActiveProjection() {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ if (mProjectionGrant != null) {
+ mProjectionGrant.stop();
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+
+ }
+
+ @Override //Binder call
+ public void addCallback(final IMediaProjectionWatcherCallback callback) {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ MediaProjectionManagerService.this.addCallback(callback);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
+ public void removeCallback(IMediaProjectionWatcherCallback callback) {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to remove "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ MediaProjectionManagerService.this.removeCallback(callback);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
}
@Override // Binder call
@@ -157,25 +316,27 @@
}
}
+
private boolean checkPermission(String packageName, String permission) {
return mContext.getPackageManager().checkPermission(permission, packageName)
== PackageManager.PERMISSION_GRANTED;
}
}
- private final class MediaProjection extends IMediaProjection.Stub implements DeathRecipient {
- public int uid;
- public String packageName;
+ private final class MediaProjection extends IMediaProjection.Stub {
+ public final int uid;
+ public final String packageName;
+ public final UserHandle userHandle;
private IBinder mToken;
+ private IBinder.DeathRecipient mDeathEater;
private int mType;
- private CallbackDelegate mCallbackDelegate;
public MediaProjection(int type, int uid, String packageName) {
mType = type;
this.uid = uid;
this.packageName = packageName;
- mCallbackDelegate = new CallbackDelegate();
+ userHandle = new UserHandle(UserHandle.getUserId(uid));
}
@Override // Binder call
@@ -220,49 +381,50 @@
}
@Override // Binder call
- public void start(IMediaProjectionCallback callback) {
+ public void start(final IMediaProjectionCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("callback must not be null");
}
synchronized (mLock) {
- if (mProjectionGrants.containsKey(asBinder())) {
+ if (isValidMediaProjection(asBinder())) {
throw new IllegalStateException(
"Cannot start already started MediaProjection");
}
addCallback(callback);
try {
mToken = callback.asBinder();
- mToken.linkToDeath(this, 0);
+ mDeathEater = new IBinder.DeathRecipient() {
+ @Override
+ public void binderDied() {
+ mCallbackDelegate.remove(callback);
+ stop();
+ }
+ };
+ mToken.linkToDeath(mDeathEater, 0);
} catch (RemoteException e) {
Slog.w(TAG,
"MediaProjectionCallbacks must be valid, aborting MediaProjection", e);
return;
}
- mProjectionGrants.put(asBinder(), this);
+ startProjectionLocked(this);
}
}
@Override // Binder call
public void stop() {
synchronized (mLock) {
- if (!mProjectionGrants.containsKey(asBinder())) {
+ if (!isValidMediaProjection(asBinder())) {
Slog.w(TAG, "Attempted to stop inactive MediaProjection "
+ "(uid=" + Binder.getCallingUid() + ", "
+ "pid=" + Binder.getCallingPid() + ")");
return;
}
- mToken.unlinkToDeath(this, 0);
- mCallbackDelegate.dispatchStop();
- mProjectionGrants.remove(asBinder());
+ mToken.unlinkToDeath(mDeathEater, 0);
+ stopProjectionLocked(this);
}
}
@Override
- public void binderDied() {
- stop();
- }
-
- @Override
public void addCallback(IMediaProjectionCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("callback must not be null");
@@ -278,52 +440,143 @@
mCallbackDelegate.remove(callback);
}
- public void dump(PrintWriter pw, String prefix) {
- pw.println(prefix + "(" + packageName + ", uid=" + uid + "): " + typeToString(mType));
+ public MediaProjectionInfo getProjectionInfo() {
+ return new MediaProjectionInfo(packageName, userHandle);
+ }
+
+ public void dump(PrintWriter pw) {
+ pw.println("(" + packageName + ", uid=" + uid + "): " + typeToString(mType));
}
}
+
private static class CallbackDelegate {
- private static final int MSG_ON_STOP = 0;
- private List<IMediaProjectionCallback> mCallbacks;
+ private Map<IBinder, IMediaProjectionCallback> mClientCallbacks;
+ private Map<IBinder, IMediaProjectionWatcherCallback> mWatcherCallbacks;
private Handler mHandler;
private Object mLock = new Object();
public CallbackDelegate() {
mHandler = new Handler(Looper.getMainLooper(), null, true /*async*/);
- mCallbacks = new ArrayList<IMediaProjectionCallback>();
+ mClientCallbacks = new ArrayMap<IBinder, IMediaProjectionCallback>();
+ mWatcherCallbacks = new ArrayMap<IBinder, IMediaProjectionWatcherCallback>();
}
public void add(IMediaProjectionCallback callback) {
synchronized (mLock) {
- mCallbacks.add(callback);
+ mClientCallbacks.put(callback.asBinder(), callback);
+ }
+ }
+
+ public void add(IMediaProjectionWatcherCallback callback) {
+ synchronized (mLock) {
+ mWatcherCallbacks.put(callback.asBinder(), callback);
}
}
public void remove(IMediaProjectionCallback callback) {
synchronized (mLock) {
- mCallbacks.remove(callback);
+ mClientCallbacks.remove(callback.asBinder());
}
}
- public void dispatchStop() {
+ public void remove(IMediaProjectionWatcherCallback callback) {
synchronized (mLock) {
- for (final IMediaProjectionCallback callback : mCallbacks) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- try {
- callback.onStop();
- } catch (RemoteException e) {
- Slog.w(TAG, "Failed to notify media projection has stopped", e);
- }
- }
- });
+ mWatcherCallbacks.remove(callback.asBinder());
+ }
+ }
+
+ public void dispatchStart(MediaProjection projection) {
+ if (projection == null) {
+ Slog.e(TAG, "Tried to dispatch start notification for a null media projection."
+ + " Ignoring!");
+ return;
+ }
+ synchronized (mLock) {
+ for (IMediaProjectionWatcherCallback callback : mWatcherCallbacks.values()) {
+ MediaProjectionInfo info = projection.getProjectionInfo();
+ mHandler.post(new WatcherStartCallback(info, callback));
+ }
+ }
+ }
+
+ public void dispatchStop(MediaProjection projection) {
+ if (projection == null) {
+ Slog.e(TAG, "Tried to dispatch stop notification for a null media projection."
+ + " Ignoring!");
+ return;
+ }
+ synchronized (mLock) {
+ for (IMediaProjectionCallback callback : mClientCallbacks.values()) {
+ mHandler.post(new ClientStopCallback(callback));
+ }
+
+ for (IMediaProjectionWatcherCallback callback : mWatcherCallbacks.values()) {
+ MediaProjectionInfo info = projection.getProjectionInfo();
+ mHandler.post(new WatcherStopCallback(info, callback));
}
}
}
}
+ private static final class WatcherStartCallback implements Runnable {
+ private IMediaProjectionWatcherCallback mCallback;
+ private MediaProjectionInfo mInfo;
+
+ public WatcherStartCallback(MediaProjectionInfo info,
+ IMediaProjectionWatcherCallback callback) {
+ mInfo = info;
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStart(mInfo);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+ private static final class WatcherStopCallback implements Runnable {
+ private IMediaProjectionWatcherCallback mCallback;
+ private MediaProjectionInfo mInfo;
+
+ public WatcherStopCallback(MediaProjectionInfo info,
+ IMediaProjectionWatcherCallback callback) {
+ mInfo = info;
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStop(mInfo);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+ private static final class ClientStopCallback implements Runnable {
+ private IMediaProjectionCallback mCallback;
+
+ public ClientStopCallback(IMediaProjectionCallback callback) {
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStop();
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+
private static String typeToString(int type) {
switch (type) {
case MediaProjectionManager.TYPE_SCREEN_CAPTURE:
diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java
index 907eeb2..857b9e9 100644
--- a/services/core/java/com/android/server/net/IpConfigStore.java
+++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -20,10 +20,10 @@
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress;
-import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.StaticIpConfiguration;
import android.os.Handler;
import android.os.HandlerThread;
import android.text.TextUtils;
@@ -41,6 +41,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.Inet4Address;
import java.util.Map;
public class IpConfigStore {
@@ -69,40 +70,32 @@
}
private boolean writeConfig(DataOutputStream out, int configKey,
- IpConfiguration config) throws IOException {
+ IpConfiguration config) throws IOException {
boolean written = false;
try {
- LinkProperties linkProperties = config.linkProperties;
switch (config.ipAssignment) {
case STATIC:
out.writeUTF(IP_ASSIGNMENT_KEY);
out.writeUTF(config.ipAssignment.toString());
- for (LinkAddress linkAddr : linkProperties.getLinkAddresses()) {
- out.writeUTF(LINK_ADDRESS_KEY);
- out.writeUTF(linkAddr.getAddress().getHostAddress());
- out.writeInt(linkAddr.getPrefixLength());
- }
- for (RouteInfo route : linkProperties.getRoutes()) {
- out.writeUTF(GATEWAY_KEY);
- LinkAddress dest = route.getDestinationLinkAddress();
- if (dest != null) {
- out.writeInt(1);
- out.writeUTF(dest.getAddress().getHostAddress());
- out.writeInt(dest.getPrefixLength());
- } else {
- out.writeInt(0);
+ StaticIpConfiguration staticIpConfiguration = config.staticIpConfiguration;
+ if (staticIpConfiguration != null) {
+ if (staticIpConfiguration.ipAddress != null) {
+ LinkAddress ipAddress = staticIpConfiguration.ipAddress;
+ out.writeUTF(LINK_ADDRESS_KEY);
+ out.writeUTF(ipAddress.getAddress().getHostAddress());
+ out.writeInt(ipAddress.getPrefixLength());
}
- if (route.getGateway() != null) {
- out.writeInt(1);
- out.writeUTF(route.getGateway().getHostAddress());
- } else {
- out.writeInt(0);
+ if (staticIpConfiguration.gateway != null) {
+ out.writeUTF(GATEWAY_KEY);
+ out.writeInt(0); // Default route.
+ out.writeInt(1); // Have a gateway.
+ out.writeUTF(staticIpConfiguration.gateway.getHostAddress());
}
- }
- for (InetAddress inetAddr : linkProperties.getDnsServers()) {
- out.writeUTF(DNS_KEY);
- out.writeUTF(inetAddr.getHostAddress());
+ for (InetAddress inetAddr : staticIpConfiguration.dnsServers) {
+ out.writeUTF(DNS_KEY);
+ out.writeUTF(inetAddr.getHostAddress());
+ }
}
written = true;
break;
@@ -121,7 +114,7 @@
switch (config.proxySettings) {
case STATIC:
- ProxyInfo proxyProperties = linkProperties.getHttpProxy();
+ ProxyInfo proxyProperties = config.httpProxy;
String exclusionList = proxyProperties.getExclusionListAsString();
out.writeUTF(PROXY_SETTINGS_KEY);
out.writeUTF(config.proxySettings.toString());
@@ -134,7 +127,7 @@
written = true;
break;
case PAC:
- ProxyInfo proxyPacProperties = linkProperties.getHttpProxy();
+ ProxyInfo proxyPacProperties = config.httpProxy;
out.writeUTF(PROXY_SETTINGS_KEY);
out.writeUTF(config.proxySettings.toString());
out.writeUTF(PROXY_PAC_FILE);
@@ -159,7 +152,7 @@
out.writeInt(configKey);
}
} catch (NullPointerException e) {
- loge("Failure in writing " + config.linkProperties + e);
+ loge("Failure in writing " + config + e);
}
out.writeUTF(EOS);
@@ -196,7 +189,7 @@
// Default is DHCP with no proxy
IpAssignment ipAssignment = IpAssignment.DHCP;
ProxySettings proxySettings = ProxySettings.NONE;
- LinkProperties linkProperties = new LinkProperties();
+ StaticIpConfiguration staticIpConfiguration = new StaticIpConfiguration();
String proxyHost = null;
String pacFileUrl = null;
int proxyPort = -1;
@@ -213,13 +206,23 @@
} else if (key.equals(LINK_ADDRESS_KEY)) {
LinkAddress linkAddr = new LinkAddress(
NetworkUtils.numericToInetAddress(in.readUTF()), in.readInt());
- linkProperties.addLinkAddress(linkAddr);
+ if (linkAddr.getAddress() instanceof Inet4Address &&
+ staticIpConfiguration.ipAddress == null) {
+ staticIpConfiguration.ipAddress = linkAddr;
+ } else {
+ loge("Non-IPv4 or duplicate address: " + linkAddr);
+ }
} else if (key.equals(GATEWAY_KEY)) {
LinkAddress dest = null;
InetAddress gateway = null;
if (version == 1) {
// only supported default gateways - leave the dest/prefix empty
gateway = NetworkUtils.numericToInetAddress(in.readUTF());
+ if (staticIpConfiguration.gateway == null) {
+ staticIpConfiguration.gateway = gateway;
+ } else {
+ loge("Duplicate gateway: " + gateway.getHostAddress());
+ }
} else {
if (in.readInt() == 1) {
dest = new LinkAddress(
@@ -229,10 +232,16 @@
if (in.readInt() == 1) {
gateway = NetworkUtils.numericToInetAddress(in.readUTF());
}
+ RouteInfo route = new RouteInfo(dest, gateway);
+ if (route.isIPv4Default() &&
+ staticIpConfiguration.gateway == null) {
+ staticIpConfiguration.gateway = gateway;
+ } else {
+ loge("Non-IPv4 default or duplicate route: " + route);
+ }
}
- linkProperties.addRoute(new RouteInfo(dest, gateway));
} else if (key.equals(DNS_KEY)) {
- linkProperties.addDnsServer(
+ staticIpConfiguration.dnsServers.add(
NetworkUtils.numericToInetAddress(in.readUTF()));
} else if (key.equals(PROXY_SETTINGS_KEY)) {
proxySettings = ProxySettings.valueOf(in.readUTF());
@@ -258,9 +267,11 @@
IpConfiguration config = new IpConfiguration();
networks.put(id, config);
- config.linkProperties = linkProperties;
switch (ipAssignment) {
case STATIC:
+ config.staticIpConfiguration = staticIpConfiguration;
+ config.ipAssignment = ipAssignment;
+ break;
case DHCP:
config.ipAssignment = ipAssignment;
break;
@@ -276,16 +287,15 @@
switch (proxySettings) {
case STATIC:
- config.proxySettings = proxySettings;
- ProxyInfo ProxyInfo =
+ ProxyInfo proxyInfo =
new ProxyInfo(proxyHost, proxyPort, exclusionList);
- linkProperties.setHttpProxy(ProxyInfo);
+ config.proxySettings = proxySettings;
+ config.httpProxy = proxyInfo;
break;
case PAC:
+ ProxyInfo proxyPacProperties = new ProxyInfo(pacFileUrl);
config.proxySettings = proxySettings;
- ProxyInfo proxyPacProperties =
- new ProxyInfo(pacFileUrl);
- linkProperties.setHttpProxy(proxyPacProperties);
+ config.httpProxy = proxyPacProperties;
break;
case NONE:
config.proxySettings = proxySettings;
diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index a2e9d676..52e741b 100644
--- a/services/core/java/com/android/server/net/LockdownVpnTracker.java
+++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java
@@ -304,16 +304,18 @@
}
private void showNotification(int titleRes, int iconRes) {
- final Notification.Builder builder = new Notification.Builder(mContext);
- builder.setWhen(0);
- builder.setSmallIcon(iconRes);
- builder.setContentTitle(mContext.getString(titleRes));
- builder.setContentText(mContext.getString(R.string.vpn_lockdown_config));
- builder.setContentIntent(mConfigIntent);
- builder.setPriority(Notification.PRIORITY_LOW);
- builder.setOngoing(true);
- builder.addAction(
- R.drawable.ic_menu_refresh, mContext.getString(R.string.reset), mResetIntent);
+ final Notification.Builder builder = new Notification.Builder(mContext)
+ .setWhen(0)
+ .setSmallIcon(iconRes)
+ .setContentTitle(mContext.getString(titleRes))
+ .setContentText(mContext.getString(R.string.vpn_lockdown_config))
+ .setContentIntent(mConfigIntent)
+ .setPriority(Notification.PRIORITY_LOW)
+ .setOngoing(true)
+ .addAction(R.drawable.ic_menu_refresh, mContext.getString(R.string.reset),
+ mResetIntent)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
NotificationManager.from(mContext).notify(TAG, 0, builder.build());
}
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index ad2bb92..9e5fa41 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -791,6 +791,8 @@
final Notification.Builder builder = new Notification.Builder(mContext);
builder.setOnlyAlertOnce(true);
builder.setWhen(0L);
+ builder.setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
final Resources res = mContext.getResources();
switch (type) {
@@ -916,6 +918,8 @@
builder.setTicker(title);
builder.setContentTitle(title);
builder.setContentText(body);
+ builder.setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
final Intent intent = buildAllowBackgroundDataIntent();
builder.setContentIntent(
@@ -1060,9 +1064,11 @@
final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
final String baseIface = state.linkProperties.getInterfaceName();
- connIdents.add(Pair.create(baseIface, ident));
- if (powerSave) {
- connIfaces.add(baseIface);
+ if (baseIface != null) {
+ connIdents.add(Pair.create(baseIface, ident));
+ if (powerSave) {
+ connIfaces.add(baseIface);
+ }
}
// Stacked interfaces are considered to have same identity as
@@ -1070,9 +1076,11 @@
final List<LinkProperties> stackedLinks = state.linkProperties.getStackedLinks();
for (LinkProperties stackedLink : stackedLinks) {
final String stackedIface = stackedLink.getInterfaceName();
- connIdents.add(Pair.create(stackedIface, ident));
- if (powerSave) {
- connIfaces.add(stackedIface);
+ if (stackedIface != null) {
+ connIdents.add(Pair.create(stackedIface, ident));
+ if (powerSave) {
+ connIfaces.add(stackedIface);
+ }
}
}
}
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index e35ca46..f995dee 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -896,10 +896,12 @@
// Traffic occurring on the base interface is always counted for
// both total usage and UID details.
final String baseIface = state.linkProperties.getInterfaceName();
- findOrCreateNetworkIdentitySet(mActiveIfaces, baseIface).add(ident);
- findOrCreateNetworkIdentitySet(mActiveUidIfaces, baseIface).add(ident);
- if (isMobile) {
- mobileIfaces.add(baseIface);
+ if (baseIface != null) {
+ findOrCreateNetworkIdentitySet(mActiveIfaces, baseIface).add(ident);
+ findOrCreateNetworkIdentitySet(mActiveUidIfaces, baseIface).add(ident);
+ if (isMobile) {
+ mobileIfaces.add(baseIface);
+ }
}
// Traffic occurring on stacked interfaces is usually clatd,
@@ -909,15 +911,16 @@
final List<LinkProperties> stackedLinks = state.linkProperties.getStackedLinks();
for (LinkProperties stackedLink : stackedLinks) {
final String stackedIface = stackedLink.getInterfaceName();
- findOrCreateNetworkIdentitySet(mActiveUidIfaces, stackedIface).add(ident);
- if (isMobile) {
- mobileIfaces.add(stackedIface);
+ if (stackedIface != null) {
+ findOrCreateNetworkIdentitySet(mActiveUidIfaces, stackedIface).add(ident);
+ if (isMobile) {
+ mobileIfaces.add(stackedIface);
+ }
}
}
}
}
- mobileIfaces.remove(null);
mMobileIfaces = mobileIfaces.toArray(new String[mobileIfaces.size()]);
}
diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java
index a06daf6..189131c 100644
--- a/services/core/java/com/android/server/notification/ConditionProviders.java
+++ b/services/core/java/com/android/server/notification/ConditionProviders.java
@@ -51,8 +51,9 @@
= new ArrayMap<IBinder, IConditionListener>();
private final ArrayList<ConditionRecord> mRecords = new ArrayList<ConditionRecord>();
private final CountdownConditionProvider mCountdown = new CountdownConditionProvider();
+ private final DowntimeConditionProvider mDowntime = new DowntimeConditionProvider();
- private Uri mExitConditionId;
+ private Condition mExitCondition;
private ComponentName mExitConditionComponent;
public ConditionProviders(Context context, Handler handler,
@@ -97,6 +98,7 @@
}
}
mCountdown.dump(pw, filter);
+ mDowntime.dump(pw, filter);
}
@Override
@@ -110,6 +112,10 @@
mCountdown.attachBase(mContext);
registerService(mCountdown.asInterface(), CountdownConditionProvider.COMPONENT,
UserHandle.USER_OWNER);
+ mDowntime.attachBase(mContext);
+ registerService(mDowntime.asInterface(), DowntimeConditionProvider.COMPONENT,
+ UserHandle.USER_OWNER);
+ mDowntime.setCallback(new DowntimeCallback());
}
@Override
@@ -125,7 +131,7 @@
if (info.component.equals(mExitConditionComponent)) {
// ensure record exists, we'll wire it up and subscribe below
final ConditionRecord manualRecord =
- getRecordLocked(mExitConditionId, mExitConditionComponent);
+ getRecordLocked(mExitCondition.id, mExitConditionComponent);
manualRecord.isManual = true;
}
final int N = mRecords.size();
@@ -149,11 +155,11 @@
if (!r.component.equals(removed.component)) continue;
if (r.isManual) {
// removing the current manual condition, exit zen
- mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF);
+ mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF, "manualServiceRemoved");
}
if (r.isAutomatic) {
// removing an automatic condition, exit zen
- mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF);
+ mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF, "automaticServiceRemoved");
}
mRecords.remove(i);
}
@@ -249,7 +255,8 @@
} else if (DEBUG) {
Slog.d(TAG, "Exit zen: manual condition false: " + c);
}
- mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_OFF);
+ mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_OFF,
+ "manualConditionExit");
unsubscribeLocked(r);
r.isManual = false;
}
@@ -263,33 +270,46 @@
} else if (DEBUG) {
Slog.d(TAG, "Exit zen: automatic condition false: " + c);
}
- mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_OFF);
+ mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_OFF,
+ "automaticConditionExit");
} else if (c.state == Condition.STATE_TRUE) {
Slog.d(TAG, "Enter zen: automatic condition true: " + c);
- mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ mZenModeHelper.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+ "automaticConditionEnter");
}
}
}
}
}
- public void setZenModeCondition(Uri conditionId, String reason) {
- if (DEBUG) Slog.d(TAG, "setZenModeCondition " + conditionId);
+ public void setZenModeCondition(Condition condition, String reason) {
+ if (DEBUG) Slog.d(TAG, "setZenModeCondition " + condition);
synchronized(mMutex) {
ComponentName conditionComponent = null;
- if (ZenModeConfig.isValidCountdownConditionId(conditionId)) {
- // constructed by the client, make sure the record exists...
- final ConditionRecord r = getRecordLocked(conditionId,
- CountdownConditionProvider.COMPONENT);
- if (r.info == null) {
- // ... and is associated with the in-process service
- r.info = checkServiceTokenLocked(mCountdown.asInterface());
+ if (condition != null) {
+ if (ZenModeConfig.isValidCountdownConditionId(condition.id)) {
+ // constructed by the client, make sure the record exists...
+ final ConditionRecord r = getRecordLocked(condition.id,
+ CountdownConditionProvider.COMPONENT);
+ if (r.info == null) {
+ // ... and is associated with the in-process service
+ r.info = checkServiceTokenLocked(mCountdown.asInterface());
+ }
+ }
+ if (ZenModeConfig.isValidDowntimeConditionId(condition.id)) {
+ // constructed by the client, make sure the record exists...
+ final ConditionRecord r = getRecordLocked(condition.id,
+ DowntimeConditionProvider.COMPONENT);
+ if (r.info == null) {
+ // ... and is associated with the in-process service
+ r.info = checkServiceTokenLocked(mDowntime.asInterface());
+ }
}
}
final int N = mRecords.size();
for (int i = 0; i < N; i++) {
final ConditionRecord r = mRecords.get(i);
- final boolean idEqual = r.id.equals(conditionId);
+ final boolean idEqual = condition != null && r.id.equals(condition.id);
if (r.isManual && !idEqual) {
// was previous manual condition, unsubscribe
unsubscribeLocked(r);
@@ -303,10 +323,10 @@
conditionComponent = r.component;
}
}
- if (!Objects.equals(mExitConditionId, conditionId)) {
- mExitConditionId = conditionId;
+ if (!Objects.equals(mExitCondition, condition)) {
+ mExitCondition = condition;
mExitConditionComponent = conditionComponent;
- ZenLog.traceExitCondition(mExitConditionId, mExitConditionComponent, reason);
+ ZenLog.traceExitCondition(mExitCondition, mExitConditionComponent, reason);
saveZenConfigLocked();
}
}
@@ -318,6 +338,7 @@
RemoteException re = null;
if (provider != null) {
try {
+ Slog.d(TAG, "Subscribing to " + r.id + " with " + provider);
provider.onSubscribe(r.id);
} catch (RemoteException e) {
Slog.w(TAG, "Error subscribing to " + r, e);
@@ -436,12 +457,13 @@
return;
}
synchronized (mMutex) {
- final boolean changingExit = !Objects.equals(mExitConditionId, config.exitConditionId);
- mExitConditionId = config.exitConditionId;
+ final boolean changingExit = !Objects.equals(mExitCondition, config.exitCondition);
+ mExitCondition = config.exitCondition;
mExitConditionComponent = config.exitConditionComponent;
if (changingExit) {
- ZenLog.traceExitCondition(mExitConditionId, mExitConditionComponent, "config");
+ ZenLog.traceExitCondition(mExitCondition, mExitConditionComponent, "config");
}
+ mDowntime.setConfig(config);
if (config.conditionComponents == null || config.conditionIds == null
|| config.conditionComponents.length != config.conditionIds.length) {
if (DEBUG) Slog.d(TAG, "loadZenConfig: no conditions");
@@ -488,7 +510,7 @@
config.conditionIds[i] = r.id;
}
}
- config.exitConditionId = mExitConditionId;
+ config.exitCondition = mExitCondition;
config.exitConditionComponent = mExitConditionComponent;
if (DEBUG) Slog.d(TAG, "Setting zen config to: " + config);
mZenModeHelper.setConfig(config);
@@ -510,6 +532,26 @@
}
}
+ private class DowntimeCallback implements DowntimeConditionProvider.Callback {
+ @Override
+ public void onDowntimeChanged(boolean inDowntime) {
+ final int mode = mZenModeHelper.getZenMode();
+ final ZenModeConfig config = mZenModeHelper.getConfig();
+ // enter downtime
+ if (inDowntime && mode == Global.ZEN_MODE_OFF && config != null) {
+ final Condition condition = mDowntime.createCondition(config.toDowntimeInfo(),
+ Condition.STATE_TRUE);
+ mZenModeHelper.setZenMode(Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, "downtimeEnter");
+ setZenModeCondition(condition, "downtime");
+ }
+ // exit downtime
+ if (!inDowntime && mode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
+ && mDowntime.isDowntimeCondition(mExitCondition)) {
+ mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF, "downtimeExit");
+ }
+ }
+ }
+
private static class ConditionRecord {
public final Uri id;
public final ComponentName component;
diff --git a/services/core/java/com/android/server/notification/CountdownConditionProvider.java b/services/core/java/com/android/server/notification/CountdownConditionProvider.java
index aaf7cfc..37aacaa 100644
--- a/services/core/java/com/android/server/notification/CountdownConditionProvider.java
+++ b/services/core/java/com/android/server/notification/CountdownConditionProvider.java
@@ -29,6 +29,7 @@
import android.service.notification.IConditionProvider;
import android.service.notification.ZenModeConfig;
import android.text.format.DateUtils;
+import android.util.Log;
import android.util.Slog;
import com.android.server.notification.NotificationManagerService.DumpFilter;
@@ -38,8 +39,8 @@
/** Built-in zen condition provider for simple time-based conditions */
public class CountdownConditionProvider extends ConditionProviderService {
- private static final String TAG = "CountdownConditionProvider";
- private static final boolean DEBUG = false;
+ private static final String TAG = "CountdownConditions";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
public static final ComponentName COMPONENT =
new ComponentName("android", CountdownConditionProvider.class.getName());
diff --git a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java
new file mode 100644
index 0000000..317ebef
--- /dev/null
+++ b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java
@@ -0,0 +1,289 @@
+/**
+ * Copyright (c) 2014, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.notification;
+
+import android.app.AlarmManager;
+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.net.Uri;
+import android.service.notification.Condition;
+import android.service.notification.ConditionProviderService;
+import android.service.notification.IConditionProvider;
+import android.service.notification.ZenModeConfig;
+import android.service.notification.ZenModeConfig.DowntimeInfo;
+import android.text.format.DateFormat;
+import android.util.ArraySet;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.internal.R;
+import com.android.server.notification.NotificationManagerService.DumpFilter;
+
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Objects;
+
+/** Built-in zen condition provider for managing downtime */
+public class DowntimeConditionProvider extends ConditionProviderService {
+ private static final String TAG = "DowntimeConditions";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+ public static final ComponentName COMPONENT =
+ new ComponentName("android", DowntimeConditionProvider.class.getName());
+
+ private static final String ENTER_ACTION = TAG + ".enter";
+ private static final int ENTER_CODE = 100;
+ private static final String EXIT_ACTION = TAG + ".exit";
+ private static final int EXIT_CODE = 101;
+ private static final String EXTRA_TIME = "time";
+
+ private final Calendar mCalendar = Calendar.getInstance();
+ private final Context mContext = this;
+ private final ArraySet<Integer> mDays = new ArraySet<Integer>();
+
+ private boolean mConnected;
+ private boolean mInDowntime;
+ private ZenModeConfig mConfig;
+ private Callback mCallback;
+
+ public DowntimeConditionProvider() {
+ if (DEBUG) Slog.d(TAG, "new DowntimeConditionProvider()");
+ }
+
+ public void dump(PrintWriter pw, DumpFilter filter) {
+ pw.println(" DowntimeConditionProvider:");
+ pw.print(" mConnected="); pw.println(mConnected);
+ pw.print(" mInDowntime="); pw.println(mInDowntime);
+ }
+
+ public void attachBase(Context base) {
+ attachBaseContext(base);
+ }
+
+ public IConditionProvider asInterface() {
+ return (IConditionProvider) onBind(null);
+ }
+
+ public void setCallback(Callback callback) {
+ mCallback = callback;
+ }
+
+ @Override
+ public void onConnected() {
+ if (DEBUG) Slog.d(TAG, "onConnected");
+ mConnected = true;
+ final IntentFilter filter = new IntentFilter();
+ filter.addAction(ENTER_ACTION);
+ filter.addAction(EXIT_ACTION);
+ filter.addAction(Intent.ACTION_TIME_CHANGED);
+ filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+ mContext.registerReceiver(mReceiver, filter);
+ init();
+ }
+
+ @Override
+ public void onDestroy() {
+ if (DEBUG) Slog.d(TAG, "onDestroy");
+ mConnected = false;
+ }
+
+ @Override
+ public void onRequestConditions(int relevance) {
+ if (DEBUG) Slog.d(TAG, "onRequestConditions relevance=" + relevance);
+ if ((relevance & Condition.FLAG_RELEVANT_NOW) != 0) {
+ if (mInDowntime && mConfig != null) {
+ notifyCondition(createCondition(mConfig.toDowntimeInfo(), Condition.STATE_TRUE));
+ }
+ }
+ }
+
+ @Override
+ public void onSubscribe(Uri conditionId) {
+ if (DEBUG) Slog.d(TAG, "onSubscribe conditionId=" + conditionId);
+ final DowntimeInfo downtime = ZenModeConfig.tryParseDowntimeConditionId(conditionId);
+ if (downtime != null && mConfig != null) {
+ final int state = mConfig.toDowntimeInfo().equals(downtime) && mInDowntime
+ ? Condition.STATE_TRUE : Condition.STATE_FALSE;
+ if (DEBUG) Slog.d(TAG, "notify condition state: " + Condition.stateToString(state));
+ notifyCondition(createCondition(downtime, state));
+ }
+ }
+
+ @Override
+ public void onUnsubscribe(Uri conditionId) {
+ if (DEBUG) Slog.d(TAG, "onUnsubscribe conditionId=" + conditionId);
+ }
+
+ public void setConfig(ZenModeConfig config) {
+ if (Objects.equals(mConfig, config)) return;
+ if (DEBUG) Slog.d(TAG, "setConfig");
+ mConfig = config;
+ if (mConnected) {
+ init();
+ }
+ }
+
+ public boolean isInDowntime() {
+ return mInDowntime;
+ }
+
+ public Condition createCondition(DowntimeInfo downtime, int state) {
+ if (downtime == null) return null;
+ final Uri id = ZenModeConfig.toDowntimeConditionId(downtime);
+ final String skeleton = DateFormat.is24HourFormat(mContext) ? "Hm" : "hma";
+ final Locale locale = Locale.getDefault();
+ final String pattern = DateFormat.getBestDateTimePattern(locale, skeleton);
+ final long time = getTime(System.currentTimeMillis(), downtime.endHour, downtime.endMinute);
+ final String formatted = new SimpleDateFormat(pattern, locale).format(new Date(time));
+ final String summary = mContext.getString(R.string.downtime_condition_summary, formatted);
+ return new Condition(id, summary, "", "", 0, state, Condition.FLAG_RELEVANT_NOW);
+ }
+
+ public boolean isDowntimeCondition(Condition condition) {
+ return condition != null && ZenModeConfig.isValidDowntimeConditionId(condition.id);
+ }
+
+ private void init() {
+ updateDays();
+ reevaluateDowntime();
+ updateAlarms();
+ }
+
+ private void updateDays() {
+ mDays.clear();
+ if (mConfig != null) {
+ final int[] days = ZenModeConfig.tryParseDays(mConfig.sleepMode);
+ for (int i = 0; days != null && i < days.length; i++) {
+ mDays.add(days[i]);
+ }
+ }
+ }
+
+ private boolean isInDowntime(long time) {
+ if (mConfig == null || mDays.size() == 0) return false;
+ final long start = getTime(time, mConfig.sleepStartHour, mConfig.sleepStartMinute);
+ long end = getTime(time, mConfig.sleepEndHour, mConfig.sleepEndMinute);
+ if (start == end) return false;
+ if (end < start) {
+ end = addDays(end, 1);
+ }
+ return isInDowntime(-1, time, start, end) || isInDowntime(0, time, start, end);
+ }
+
+ private boolean isInDowntime(int daysOffset, long time, long start, long end) {
+ final int day = ((getDayOfWeek(time) + daysOffset - 1) % Calendar.SATURDAY) + 1;
+ start = addDays(start, daysOffset);
+ end = addDays(end, daysOffset);
+ return mDays.contains(day) && time >= start && time < end;
+ }
+
+ private void reevaluateDowntime() {
+ final boolean inDowntime = isInDowntime(System.currentTimeMillis());
+ if (DEBUG) Slog.d(TAG, "inDowntime=" + inDowntime);
+ if (inDowntime == mInDowntime) return;
+ Slog.i(TAG, (inDowntime ? "Entering" : "Exiting" ) + " downtime");
+ mInDowntime = inDowntime;
+ ZenLog.traceDowntime(mInDowntime, getDayOfWeek(System.currentTimeMillis()), mDays);
+ fireDowntimeChanged();
+ }
+
+ private void fireDowntimeChanged() {
+ if (mCallback != null) {
+ mCallback.onDowntimeChanged(mInDowntime);
+ }
+ }
+
+ private void updateAlarms() {
+ if (mConfig == null) return;
+ updateAlarm(ENTER_ACTION, ENTER_CODE, mConfig.sleepStartHour, mConfig.sleepStartMinute);
+ updateAlarm(EXIT_ACTION, EXIT_CODE, mConfig.sleepEndHour, mConfig.sleepEndMinute);
+ }
+
+ private int getDayOfWeek(long time) {
+ mCalendar.setTimeInMillis(time);
+ return mCalendar.get(Calendar.DAY_OF_WEEK);
+ }
+
+ private long getTime(long millis, int hour, int min) {
+ mCalendar.setTimeInMillis(millis);
+ mCalendar.set(Calendar.HOUR_OF_DAY, hour);
+ mCalendar.set(Calendar.MINUTE, min);
+ mCalendar.set(Calendar.SECOND, 0);
+ mCalendar.set(Calendar.MILLISECOND, 0);
+ return mCalendar.getTimeInMillis();
+ }
+
+ private long addDays(long time, int days) {
+ mCalendar.setTimeInMillis(time);
+ mCalendar.add(Calendar.DATE, days);
+ return mCalendar.getTimeInMillis();
+ }
+
+ private void updateAlarm(String action, int requestCode, int hr, int min) {
+ final AlarmManager alarms = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+ final long now = System.currentTimeMillis();
+ mCalendar.setTimeInMillis(now);
+ mCalendar.set(Calendar.HOUR_OF_DAY, hr);
+ mCalendar.set(Calendar.MINUTE, min);
+ mCalendar.set(Calendar.SECOND, 0);
+ mCalendar.set(Calendar.MILLISECOND, 0);
+ long time = mCalendar.getTimeInMillis();
+ if (time <= now) {
+ time = addDays(time, 1);
+ }
+ final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, requestCode,
+ new Intent(action).putExtra(EXTRA_TIME, time), PendingIntent.FLAG_UPDATE_CURRENT);
+ alarms.cancel(pendingIntent);
+ if (mConfig.sleepMode != null) {
+ if (DEBUG) Slog.d(TAG, String.format("Scheduling %s for %s, %s in the future, now=%s",
+ action, ts(time), time - now, ts(now)));
+ alarms.setExact(AlarmManager.RTC_WAKEUP, time, pendingIntent);
+ }
+ }
+
+ private static String ts(long time) {
+ return new Date(time) + " (" + time + ")";
+ }
+
+ private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final String action = intent.getAction();
+ final long now = System.currentTimeMillis();
+ if (ENTER_ACTION.equals(action) || EXIT_ACTION.equals(action)) {
+ final long schTime = intent.getLongExtra(EXTRA_TIME, 0);
+ if (DEBUG) Slog.d(TAG, String.format("%s scheduled for %s, fired at %s, delta=%s",
+ action, ts(schTime), ts(now), now - schTime));
+ } else {
+ if (DEBUG) Slog.d(TAG, action + " fired at " + now);
+ }
+ reevaluateDowntime();
+ updateAlarms();
+ }
+ };
+
+ public interface Callback {
+ void onDowntimeChanged(boolean inDowntime);
+ }
+}
diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 36be21f..f647037 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -41,6 +41,7 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.util.ArraySet;
+import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
@@ -64,7 +65,7 @@
*/
abstract public class ManagedServices {
protected final String TAG = getClass().getSimpleName();
- protected static final boolean DEBUG = true;
+ protected final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final String ENABLED_SERVICES_SEPARATOR = ":";
diff --git a/services/core/java/com/android/server/notification/NotificationDelegate.java b/services/core/java/com/android/server/notification/NotificationDelegate.java
index 1b59f52..97f0a1e 100644
--- a/services/core/java/com/android/server/notification/NotificationDelegate.java
+++ b/services/core/java/com/android/server/notification/NotificationDelegate.java
@@ -16,8 +16,6 @@
package com.android.server.notification;
-import android.os.IBinder;
-
public interface NotificationDelegate {
void onSetDisabled(int status);
void onClearAll(int callingUid, int callingPid, int userId);
@@ -29,7 +27,6 @@
int uid, int initialPid, String message, int userId);
void onPanelRevealed();
void onPanelHidden();
- boolean allowDisable(int what, IBinder token, String pkg);
void onNotificationVisibilityChanged(
String[] newlyVisibleKeys, String[] noLongerVisibleKeys);
void onNotificationExpansionChanged(String key, boolean userAction, boolean expanded);
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 3eb2b7e..45bd812 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -29,7 +29,6 @@
import android.app.INotificationManager;
import android.app.ITransientNotification;
import android.app.Notification;
-import android.app.Notification.Builder;
import android.app.PendingIntent;
import android.app.StatusBarManager;
import android.content.BroadcastReceiver;
@@ -50,7 +49,6 @@
import android.media.IRingtonePlayer;
import android.net.Uri;
import android.os.Binder;
-import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.HandlerThread;
@@ -585,11 +583,6 @@
}
@Override
- public boolean allowDisable(int what, IBinder token, String pkg) {
- return mZenModeHelper.allowDisable(what, token, pkg);
- }
-
- @Override
public void onNotificationVisibilityChanged(
String[] newlyVisibleKeys, String[] noLongerVisibleKeys) {
// Using ';' as separator since eventlogs uses ',' to separate
@@ -1351,11 +1344,11 @@
}
@Override
- public void setZenModeCondition(Uri conditionId) {
+ public void setZenModeCondition(Condition condition) {
enforceSystemOrSystemUI("INotificationManager.setZenModeCondition");
final long identity = Binder.clearCallingIdentity();
try {
- mConditionProviders.setZenModeCondition(conditionId, "binderCall");
+ mConditionProviders.setZenModeCondition(condition, "binderCall");
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -1535,14 +1528,15 @@
}
checkCallerIsSystemOrSameApp(pkg);
final boolean isSystemNotification = isUidSystem(callingUid) || ("android".equals(pkg));
+ final boolean isNotificationFromListener = mListeners.isListenerPackage(pkg);
final int userId = ActivityManager.handleIncomingUser(callingPid,
callingUid, incomingUserId, true, false, "enqueueNotification", pkg);
final UserHandle user = new UserHandle(userId);
// Limit the number of notifications that any given package except the android
- // package can enqueue. Prevents DOS attacks and deals with leaks.
- if (!isSystemNotification) {
+ // package or a registered listener can enqueue. Prevents DOS attacks and deals with leaks.
+ if (!isSystemNotification && !isNotificationFromListener) {
synchronized (mNotificationList) {
int count = 0;
final int N = mNotificationList.size();
@@ -1761,26 +1755,27 @@
if (hasValidSound) {
boolean looping =
(notification.flags & Notification.FLAG_INSISTENT) != 0;
- int audioStreamType;
- if (notification.audioStreamType >= 0) {
- audioStreamType = notification.audioStreamType;
+ AudioAttributes audioAttributes;
+ if (notification.audioAttributes != null) {
+ audioAttributes = notification.audioAttributes;
} else {
- audioStreamType = DEFAULT_STREAM_TYPE;
+ audioAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT;
}
mSoundNotification = record;
// do not play notifications if stream volume is 0 (typically because
// ringer mode is silent) or if there is a user of exclusive audio focus
- if ((mAudioManager.getStreamVolume(audioStreamType) != 0)
- && !mAudioManager.isAudioFocusExclusive()) {
+ if ((mAudioManager.getStreamVolume(
+ AudioAttributes.toLegacyStreamType(audioAttributes)) != 0)
+ && !mAudioManager.isAudioFocusExclusive()) {
final long identity = Binder.clearCallingIdentity();
try {
final IRingtonePlayer player =
mAudioManager.getRingtonePlayer();
if (player != null) {
if (DBG) Slog.v(TAG, "Playing sound " + soundUri
- + " on stream " + audioStreamType);
+ + " with attributes " + audioAttributes);
player.playAsync(soundUri, record.sbn.getUser(), looping,
- audioStreamType);
+ audioAttributes);
buzzBeepBlinked = true;
}
} catch (RemoteException e) {
@@ -2424,8 +2419,9 @@
// pulse repeatedly
mNotificationLight.setFlashing(ledARGB, Light.LIGHT_FLASH_TIMED,
ledOnMS, ledOffMS);
- mStatusBar.notificationLightPulse(ledARGB, ledOnMS, ledOffMS);
}
+ // let SystemUI make an independent decision
+ mStatusBar.notificationLightPulse(ledARGB, ledOnMS, ledOffMS);
}
}
@@ -2725,6 +2721,21 @@
Log.e(TAG, "unable to notify listener (listener hints): " + listener, ex);
}
}
+
+ private boolean isListenerPackage(String packageName) {
+ if (packageName == null) {
+ return false;
+ }
+ // TODO: clean up locking object later
+ synchronized (mNotificationList) {
+ for (final ManagedServiceInfo serviceInfo : mServices) {
+ if (packageName.equals(serviceInfo.component.getPackageName())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
public static final class DumpFilter {
diff --git a/services/core/java/com/android/server/notification/ZenLog.java b/services/core/java/com/android/server/notification/ZenLog.java
index b22ed2d..f84409e 100644
--- a/services/core/java/com/android/server/notification/ZenLog.java
+++ b/services/core/java/com/android/server/notification/ZenLog.java
@@ -22,16 +22,15 @@
import android.os.Build;
import android.os.RemoteException;
import android.provider.Settings.Global;
+import android.service.notification.Condition;
import android.service.notification.IConditionProvider;
import android.service.notification.ZenModeConfig;
+import android.util.ArraySet;
import android.util.Slog;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
public class ZenLog {
private static final String TAG = "ZenLog";
@@ -43,22 +42,19 @@
private static final String[] MSGS = new String[SIZE];
private static final SimpleDateFormat FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
- private static final Set<String> SYSTEM_PACKAGES = new HashSet<String>(Arrays.asList(
- "android",
- "com.android.systemui"
- ));
private static final int TYPE_INTERCEPTED = 1;
private static final int TYPE_ALLOW_DISABLE = 2;
private static final int TYPE_SET_RINGER_MODE = 3;
private static final int TYPE_DOWNTIME = 4;
- private static final int TYPE_ZEN_MODE = 5;
- private static final int TYPE_EXIT_CONDITION = 6;
- private static final int TYPE_SUBSCRIBE = 7;
- private static final int TYPE_UNSUBSCRIBE = 8;
- private static final int TYPE_CONFIG = 9;
- private static final int TYPE_FOLLOW_RINGER_MODE = 10;
- private static final int TYPE_NOT_INTERCEPTED = 11;
+ private static final int TYPE_SET_ZEN_MODE = 5;
+ private static final int TYPE_UPDATE_ZEN_MODE = 6;
+ private static final int TYPE_EXIT_CONDITION = 7;
+ private static final int TYPE_SUBSCRIBE = 8;
+ private static final int TYPE_UNSUBSCRIBE = 9;
+ private static final int TYPE_CONFIG = 10;
+ private static final int TYPE_FOLLOW_RINGER_MODE = 11;
+ private static final int TYPE_NOT_INTERCEPTED = 12;
private static int sNext;
private static int sSize;
@@ -73,26 +69,24 @@
append(TYPE_NOT_INTERCEPTED, record.getKey() + "," + reason);
}
- public static void traceAllowDisable(String pkg, boolean allowDisable, String reason) {
- if (SYSTEM_PACKAGES.contains(pkg)) return;
- append(TYPE_ALLOW_DISABLE, allowDisable + "," + pkg + "," + reason);
- }
-
public static void traceSetRingerMode(int ringerMode) {
append(TYPE_SET_RINGER_MODE, ringerModeToString(ringerMode));
}
- public static void traceDowntime(boolean enter, int day, int[] days) {
- append(TYPE_DOWNTIME, enter + ",day=" + day + ",days=" + (days != null ? Arrays.asList(days)
- : null));
+ public static void traceDowntime(boolean inDowntime, int day, ArraySet<Integer> days) {
+ append(TYPE_DOWNTIME, inDowntime + ",day=" + day + ",days=" + days);
+ }
+
+ public static void traceSetZenMode(int mode, String reason) {
+ append(TYPE_SET_ZEN_MODE, zenModeToString(mode) + "," + reason);
}
public static void traceUpdateZenMode(int fromMode, int toMode) {
- append(TYPE_ZEN_MODE, zenModeToString(fromMode) + " -> " + zenModeToString(toMode));
+ append(TYPE_UPDATE_ZEN_MODE, zenModeToString(fromMode) + " -> " + zenModeToString(toMode));
}
- public static void traceExitCondition(Uri id, ComponentName component, String reason) {
- append(TYPE_EXIT_CONDITION, id + "," + componentToString(component) + "," + reason);
+ public static void traceExitCondition(Condition c, ComponentName component, String reason) {
+ append(TYPE_EXIT_CONDITION, c + "," + componentToString(component) + "," + reason);
}
public static void traceSubscribe(Uri uri, IConditionProvider provider, RemoteException e) {
@@ -122,7 +116,8 @@
case TYPE_ALLOW_DISABLE: return "allow_disable";
case TYPE_SET_RINGER_MODE: return "set_ringer_mode";
case TYPE_DOWNTIME: return "downtime";
- case TYPE_ZEN_MODE: return "zen_mode";
+ case TYPE_SET_ZEN_MODE: return "set_zen_mode";
+ case TYPE_UPDATE_ZEN_MODE: return "update_zen_mode";
case TYPE_EXIT_CONDITION: return "exit_condition";
case TYPE_SUBSCRIBE: return "subscribe";
case TYPE_UNSUBSCRIBE: return "unsubscribe";
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 9282283..0b93690 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -20,10 +20,8 @@
import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
import static android.media.AudioAttributes.USAGE_UNKNOWN;
-import android.app.AlarmManager;
import android.app.AppOpsManager;
import android.app.Notification;
-import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -37,13 +35,13 @@
import android.media.AudioManager;
import android.net.Uri;
import android.os.Handler;
-import android.os.IBinder;
import android.os.UserHandle;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import android.service.notification.NotificationListenerService;
import android.service.notification.ZenModeConfig;
import android.telecomm.TelecommManager;
+import android.util.Log;
import android.util.Slog;
import com.android.internal.R;
@@ -57,8 +55,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
import java.util.Objects;
/**
@@ -66,12 +62,7 @@
*/
public class ZenModeHelper {
private static final String TAG = "ZenModeHelper";
-
- private static final String ACTION_ENTER_ZEN = "enter_zen";
- private static final int REQUEST_CODE_ENTER = 100;
- private static final String ACTION_EXIT_ZEN = "exit_zen";
- private static final int REQUEST_CODE_EXIT = 101;
- private static final String EXTRA_TIME = "time";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private final Context mContext;
private final Handler mHandler;
@@ -96,10 +87,8 @@
mSettingsObserver.observe();
final IntentFilter filter = new IntentFilter();
- filter.addAction(ACTION_ENTER_ZEN);
- filter.addAction(ACTION_EXIT_ZEN);
filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
- mContext.registerReceiver(new ZenBroadcastReceiver(), filter);
+ mContext.registerReceiver(mReceiver, filter);
}
public static ZenModeConfig readDefaultConfig(Resources resources) {
@@ -156,7 +145,7 @@
public void requestFromListener(int hints) {
final int newZen = zenFromListenerHint(hints, -1);
if (newZen != -1) {
- setZenMode(newZen);
+ setZenMode(newZen, "listener");
}
}
@@ -179,24 +168,19 @@
return false;
}
}
- // audience has veto power over all following rules
- if (!audienceMatches(record)) {
- ZenLog.traceIntercepted(record, "!audienceMatches");
- return true;
- }
if (isCall(record)) {
if (!mConfig.allowCalls) {
ZenLog.traceIntercepted(record, "!allowCalls");
return true;
}
- return false;
+ return shouldInterceptAudience(record);
}
if (isMessage(record)) {
if (!mConfig.allowMessages) {
ZenLog.traceIntercepted(record, "!allowMessages");
return true;
}
- return false;
+ return shouldInterceptAudience(record);
}
ZenLog.traceIntercepted(record, "!allowed");
return true;
@@ -204,11 +188,20 @@
return false;
}
+ private boolean shouldInterceptAudience(NotificationRecord record) {
+ if (!audienceMatches(record)) {
+ ZenLog.traceIntercepted(record, "!audienceMatches");
+ return true;
+ }
+ return false;
+ }
+
public int getZenMode() {
return mZenMode;
}
- public void setZenMode(int zenModeValue) {
+ public void setZenMode(int zenModeValue, String reason) {
+ ZenLog.traceSetZenMode(zenModeValue, reason);
Global.putInt(mContext.getContentResolver(), Global.ZEN_MODE, zenModeValue);
}
@@ -216,9 +209,6 @@
final int mode = Global.getInt(mContext.getContentResolver(),
Global.ZEN_MODE, Global.ZEN_MODE_OFF);
if (mode != mZenMode) {
- Slog.d(TAG, String.format("updateZenMode: %s -> %s",
- Global.zenModeToString(mZenMode),
- Global.zenModeToString(mode)));
ZenLog.traceUpdateZenMode(mZenMode, mode);
}
mZenMode = mode;
@@ -255,12 +245,12 @@
if (mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS) {
if (ringerMode != AudioManager.RINGER_MODE_SILENT) {
mPreviousRingerMode = ringerMode;
- Slog.d(TAG, "Silencing ringer");
+ if (DEBUG) Slog.d(TAG, "Silencing ringer");
forcedRingerMode = AudioManager.RINGER_MODE_SILENT;
}
} else {
if (ringerMode == AudioManager.RINGER_MODE_SILENT) {
- Slog.d(TAG, "Unsilencing ringer");
+ if (DEBUG) Slog.d(TAG, "Unsilencing ringer");
forcedRingerMode = mPreviousRingerMode != -1 ? mPreviousRingerMode
: AudioManager.RINGER_MODE_NORMAL;
mPreviousRingerMode = -1;
@@ -274,18 +264,6 @@
dispatchOnZenModeChanged();
}
- public boolean allowDisable(int what, IBinder token, String pkg) {
- // TODO(cwren): delete this API before the next release. Bug:15344099
- boolean allowDisable = true;
- String reason = null;
- if (isDefaultPhoneApp(pkg)) {
- allowDisable = mZenMode == Global.ZEN_MODE_OFF || mConfig.allowCalls;
- reason = mZenMode == Global.ZEN_MODE_OFF ? "zenOff" : "allowCalls";
- }
- ZenLog.traceAllowDisable(pkg, allowDisable, reason);
- return allowDisable;
- }
-
public void dump(PrintWriter pw, String prefix) {
pw.print(prefix); pw.print("mZenMode=");
pw.println(Global.zenModeToString(mZenMode));
@@ -318,7 +296,6 @@
dispatchOnConfigChanged();
final String val = Integer.toString(mConfig.hashCode());
Global.putString(mContext.getContentResolver(), Global.ZEN_MODE_CONFIG_ETAG, val);
- updateAlarms();
updateZenMode();
return true;
}
@@ -339,7 +316,7 @@
}
if (newZen != -1) {
ZenLog.traceFollowRingerMode(ringerMode, mZenMode, newZen);
- setZenMode(newZen);
+ setZenMode(newZen, "ringerMode");
}
}
}
@@ -377,7 +354,7 @@
final TelecommManager telecomm =
(TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE);
mDefaultPhoneApp = telecomm != null ? telecomm.getDefaultPhoneApp() : null;
- Slog.d(TAG, "Default phone app: " + mDefaultPhoneApp);
+ if (DEBUG) Slog.d(TAG, "Default phone app: " + mDefaultPhoneApp);
}
return pkg != null && mDefaultPhoneApp != null
&& pkg.equals(mDefaultPhoneApp.getPackageName());
@@ -409,40 +386,6 @@
}
}
- private void updateAlarms() {
- updateAlarm(ACTION_ENTER_ZEN, REQUEST_CODE_ENTER,
- mConfig.sleepStartHour, mConfig.sleepStartMinute);
- updateAlarm(ACTION_EXIT_ZEN, REQUEST_CODE_EXIT,
- mConfig.sleepEndHour, mConfig.sleepEndMinute);
- }
-
- private void updateAlarm(String action, int requestCode, int hr, int min) {
- final AlarmManager alarms = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
- final long now = System.currentTimeMillis();
- final Calendar c = Calendar.getInstance();
- c.setTimeInMillis(now);
- c.set(Calendar.HOUR_OF_DAY, hr);
- c.set(Calendar.MINUTE, min);
- c.set(Calendar.SECOND, 0);
- c.set(Calendar.MILLISECOND, 0);
- if (c.getTimeInMillis() <= now) {
- c.add(Calendar.DATE, 1);
- }
- final long time = c.getTimeInMillis();
- final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, requestCode,
- new Intent(action).putExtra(EXTRA_TIME, time), PendingIntent.FLAG_UPDATE_CURRENT);
- alarms.cancel(pendingIntent);
- if (mConfig.sleepMode != null) {
- Slog.d(TAG, String.format("Scheduling %s for %s, %s in the future, now=%s",
- action, ts(time), time - now, ts(now)));
- alarms.setExact(AlarmManager.RTC_WAKEUP, time, pendingIntent);
- }
- }
-
- private static String ts(long time) {
- return new Date(time) + " (" + time + ")";
- }
-
private final Runnable mRingerModeChanged = new Runnable() {
@Override
public void run() {
@@ -475,47 +418,12 @@
}
}
- private class ZenBroadcastReceiver extends BroadcastReceiver {
- private final Calendar mCalendar = Calendar.getInstance();
-
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- if (ACTION_ENTER_ZEN.equals(intent.getAction())) {
- setZenMode(intent, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- } else if (ACTION_EXIT_ZEN.equals(intent.getAction())) {
- setZenMode(intent, Global.ZEN_MODE_OFF);
- } else if (AudioManager.RINGER_MODE_CHANGED_ACTION.equals(intent.getAction())) {
- mHandler.post(mRingerModeChanged);
- }
+ mHandler.post(mRingerModeChanged);
}
-
- private void setZenMode(Intent intent, int zenModeValue) {
- final long schTime = intent.getLongExtra(EXTRA_TIME, 0);
- final long now = System.currentTimeMillis();
- Slog.d(TAG, String.format("%s scheduled for %s, fired at %s, delta=%s",
- intent.getAction(), ts(schTime), ts(now), now - schTime));
-
- final int[] days = ZenModeConfig.tryParseDays(mConfig.sleepMode);
- boolean enter = false;
- final int day = getDayOfWeek(schTime);
- if (days != null) {
- for (int i = 0; i < days.length; i++) {
- if (days[i] == day) {
- enter = true;
- ZenModeHelper.this.setZenMode(zenModeValue);
- break;
- }
- }
- }
- ZenLog.traceDowntime(enter, day, days);
- updateAlarms();
- }
-
- private int getDayOfWeek(long time) {
- mCalendar.setTimeInMillis(time);
- return mCalendar.get(Calendar.DAY_OF_WEEK);
- }
- }
+ };
public static class Callback {
void onConfigChanged() {}
diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index b261ef5..d1e03ec 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -16,33 +16,23 @@
package com.android.server.pm;
-import com.android.server.SystemService;
-
import android.content.Context;
import android.content.pm.PackageStats;
-import android.net.LocalSocket;
-import android.net.LocalSocketAddress;
+import android.os.Build;
import android.util.Slog;
+import dalvik.system.VMRuntime;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
+import com.android.internal.os.InstallerConnection;
+import com.android.server.SystemService;
public final class Installer extends SystemService {
private static final String TAG = "Installer";
- private static final boolean LOCAL_DEBUG = false;
-
- InputStream mIn;
- OutputStream mOut;
- LocalSocket mSocket;
-
- byte buf[] = new byte[1024];
- int buflen = 0;
+ private final InstallerConnection mInstaller;
public Installer(Context context) {
super(context);
+ mInstaller = new InstallerConnection();
}
@Override
@@ -51,154 +41,6 @@
ping();
}
- private boolean connect() {
- if (mSocket != null) {
- return true;
- }
- Slog.i(TAG, "connecting...");
- try {
- mSocket = new LocalSocket();
-
- LocalSocketAddress address = new LocalSocketAddress("installd",
- LocalSocketAddress.Namespace.RESERVED);
-
- mSocket.connect(address);
-
- mIn = mSocket.getInputStream();
- mOut = mSocket.getOutputStream();
- } catch (IOException ex) {
- disconnect();
- return false;
- }
- return true;
- }
-
- private void disconnect() {
- Slog.i(TAG, "disconnecting...");
- try {
- if (mSocket != null)
- mSocket.close();
- } catch (IOException ex) {
- }
- try {
- if (mIn != null)
- mIn.close();
- } catch (IOException ex) {
- }
- try {
- if (mOut != null)
- mOut.close();
- } catch (IOException ex) {
- }
- mSocket = null;
- mIn = null;
- mOut = null;
- }
-
- private boolean readBytes(byte buffer[], int len) {
- int off = 0, count;
- if (len < 0)
- return false;
- while (off != len) {
- try {
- count = mIn.read(buffer, off, len - off);
- if (count <= 0) {
- Slog.e(TAG, "read error " + count);
- break;
- }
- off += count;
- } catch (IOException ex) {
- Slog.e(TAG, "read exception");
- break;
- }
- }
- if (LOCAL_DEBUG) {
- Slog.i(TAG, "read " + len + " bytes");
- }
- if (off == len)
- return true;
- disconnect();
- return false;
- }
-
- private boolean readReply() {
- int len;
- buflen = 0;
- if (!readBytes(buf, 2))
- return false;
- len = (((int) buf[0]) & 0xff) | ((((int) buf[1]) & 0xff) << 8);
- if ((len < 1) || (len > 1024)) {
- Slog.e(TAG, "invalid reply length (" + len + ")");
- disconnect();
- return false;
- }
- if (!readBytes(buf, len))
- return false;
- buflen = len;
- return true;
- }
-
- private boolean writeCommand(String _cmd) {
- byte[] cmd = _cmd.getBytes();
- int len = cmd.length;
- if ((len < 1) || (len > 1024))
- return false;
- buf[0] = (byte) (len & 0xff);
- buf[1] = (byte) ((len >> 8) & 0xff);
- try {
- mOut.write(buf, 0, 2);
- mOut.write(cmd, 0, len);
- } catch (IOException ex) {
- Slog.e(TAG, "write error");
- disconnect();
- return false;
- }
- return true;
- }
-
- private synchronized String transaction(String cmd) {
- if (!connect()) {
- Slog.e(TAG, "connection failed");
- return "-1";
- }
-
- if (!writeCommand(cmd)) {
- /*
- * If installd died and restarted in the background (unlikely but
- * possible) we'll fail on the next write (this one). Try to
- * reconnect and write the command one more time before giving up.
- */
- Slog.e(TAG, "write command failed? reconnect!");
- if (!connect() || !writeCommand(cmd)) {
- return "-1";
- }
- }
- if (LOCAL_DEBUG) {
- Slog.i(TAG, "send: '" + cmd + "'");
- }
- if (readReply()) {
- String s = new String(buf, 0, buflen);
- if (LOCAL_DEBUG) {
- Slog.i(TAG, "recv: '" + s + "'");
- }
- return s;
- } else {
- if (LOCAL_DEBUG) {
- Slog.i(TAG, "fail");
- }
- return "-1";
- }
- }
-
- private int execute(String cmd) {
- String res = transaction(cmd);
- try {
- return Integer.parseInt(res);
- } catch (NumberFormatException ex) {
- return -1;
- }
- }
-
public int install(String name, int uid, int gid, String seinfo) {
StringBuilder builder = new StringBuilder("install");
builder.append(' ');
@@ -209,11 +51,16 @@
builder.append(gid);
builder.append(' ');
builder.append(seinfo != null ? seinfo : "!");
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int patchoat(String apkPath, int uid, boolean isPublic, String pkgName,
String instructionSet) {
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
StringBuilder builder = new StringBuilder("patchoat");
builder.append(' ');
builder.append(apkPath);
@@ -224,37 +71,34 @@
builder.append(pkgName);
builder.append(' ');
builder.append(instructionSet);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int patchoat(String apkPath, int uid, boolean isPublic, String instructionSet) {
- StringBuilder builder = new StringBuilder("patchoat");
- builder.append(' ');
- builder.append(apkPath);
- builder.append(' ');
- builder.append(uid);
- builder.append(isPublic ? " 1" : " 0");
- builder.append(" *"); // No pkgName arg present
- builder.append(' ');
- builder.append(instructionSet);
- return execute(builder.toString());
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
+ return mInstaller.patchoat(apkPath, uid, isPublic, instructionSet);
}
public int dexopt(String apkPath, int uid, boolean isPublic, String instructionSet) {
- StringBuilder builder = new StringBuilder("dexopt");
- builder.append(' ');
- builder.append(apkPath);
- builder.append(' ');
- builder.append(uid);
- builder.append(isPublic ? " 1" : " 0");
- builder.append(" *"); // No pkgName arg present
- builder.append(' ');
- builder.append(instructionSet);
- return execute(builder.toString());
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
+ return mInstaller.dexopt(apkPath, uid, isPublic, instructionSet);
}
public int dexopt(String apkPath, int uid, boolean isPublic, String pkgName,
String instructionSet) {
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
StringBuilder builder = new StringBuilder("dexopt");
builder.append(' ');
builder.append(apkPath);
@@ -265,7 +109,7 @@
builder.append(pkgName);
builder.append(' ');
builder.append(instructionSet);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int idmap(String targetApkPath, String overlayApkPath, int uid) {
@@ -276,10 +120,15 @@
builder.append(overlayApkPath);
builder.append(' ');
builder.append(uid);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int movedex(String srcPath, String dstPath, String instructionSet) {
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
StringBuilder builder = new StringBuilder("movedex");
builder.append(' ');
builder.append(srcPath);
@@ -287,16 +136,21 @@
builder.append(dstPath);
builder.append(' ');
builder.append(instructionSet);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int rmdex(String codePath, String instructionSet) {
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+
StringBuilder builder = new StringBuilder("rmdex");
builder.append(' ');
builder.append(codePath);
builder.append(' ');
builder.append(instructionSet);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int remove(String name, int userId) {
@@ -305,7 +159,7 @@
builder.append(name);
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int rename(String oldname, String newname) {
@@ -314,7 +168,7 @@
builder.append(oldname);
builder.append(' ');
builder.append(newname);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int fixUid(String name, int uid, int gid) {
@@ -325,7 +179,7 @@
builder.append(uid);
builder.append(' ');
builder.append(gid);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int deleteCacheFiles(String name, int userId) {
@@ -334,7 +188,7 @@
builder.append(name);
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int deleteCodeCacheFiles(String name, int userId) {
@@ -343,7 +197,7 @@
builder.append(name);
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int createUserData(String name, int uid, int userId, String seinfo) {
@@ -356,21 +210,21 @@
builder.append(userId);
builder.append(' ');
builder.append(seinfo != null ? seinfo : "!");
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int createUserConfig(int userId) {
StringBuilder builder = new StringBuilder("mkuserconfig");
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int removeUserDataDirs(int userId) {
StringBuilder builder = new StringBuilder("rmuser");
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int clearUserData(String name, int userId) {
@@ -379,11 +233,11 @@
builder.append(name);
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public boolean ping() {
- if (execute("ping") < 0) {
+ if (mInstaller.execute("ping") < 0) {
return false;
} else {
return true;
@@ -391,18 +245,25 @@
}
public int pruneDexCache(String cacheSubDir) {
- return execute("prunedexcache " + cacheSubDir);
+ return mInstaller.execute("prunedexcache " + cacheSubDir);
}
public int freeCache(long freeStorageSize) {
StringBuilder builder = new StringBuilder("freecache");
builder.append(' ');
builder.append(String.valueOf(freeStorageSize));
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public int getSizeInfo(String pkgName, int persona, String apkPath, String libDirPath,
String fwdLockApkPath, String asecPath, String[] instructionSets, PackageStats pStats) {
+ for (String instructionSet : instructionSets) {
+ if (!isValidInstructionSet(instructionSet)) {
+ Slog.e(TAG, "Invalid instruction set: " + instructionSet);
+ return -1;
+ }
+ }
+
StringBuilder builder = new StringBuilder("getsize");
builder.append(' ');
builder.append(pkgName);
@@ -423,7 +284,7 @@
// just the primary.
builder.append(instructionSets[0]);
- String s = transaction(builder.toString());
+ String s = mInstaller.transact(builder.toString());
String res[] = s.split(" ");
if ((res == null) || (res.length != 5)) {
@@ -441,7 +302,7 @@
}
public int moveFiles() {
- return execute("movefiles");
+ return mInstaller.execute("movefiles");
}
/**
@@ -467,7 +328,7 @@
builder.append(' ');
builder.append(userId);
- return execute(builder.toString());
+ return mInstaller.execute(builder.toString());
}
public boolean restoreconData(String pkgName, String seinfo, int uid) {
@@ -478,6 +339,23 @@
builder.append(seinfo != null ? seinfo : "!");
builder.append(' ');
builder.append(uid);
- return (execute(builder.toString()) == 0);
+ return (mInstaller.execute(builder.toString()) == 0);
+ }
+
+ /**
+ * Returns true iff. {@code instructionSet} is a valid instruction set.
+ */
+ private static boolean isValidInstructionSet(String instructionSet) {
+ if (instructionSet == null) {
+ return false;
+ }
+
+ for (String abi : Build.SUPPORTED_ABIS) {
+ if (instructionSet.equals(VMRuntime.getInstructionSet(abi))) {
+ return true;
+ }
+ }
+
+ return false;
}
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index c7e3fb7..03cb2e9 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -19,6 +19,7 @@
import static android.content.pm.PackageManager.INSTALL_ALL_USERS;
import static android.content.pm.PackageManager.INSTALL_FROM_ADB;
import static android.content.pm.PackageManager.INSTALL_REPLACE_EXISTING;
+import static android.net.TrafficStats.MB_IN_BYTES;
import static com.android.internal.util.XmlUtils.readBitmapAttribute;
import static com.android.internal.util.XmlUtils.readBooleanAttribute;
import static com.android.internal.util.XmlUtils.readIntAttribute;
@@ -36,20 +37,26 @@
import android.app.ActivityManager;
import android.app.AppOpsManager;
+import android.app.PackageDeleteObserver;
+import android.app.PackageInstallObserver;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.IPackageDeleteObserver2;
+import android.content.IntentSender;
+import android.content.IntentSender.SendIntentException;
+import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageInstaller;
import android.content.pm.IPackageInstallerCallback;
import android.content.pm.IPackageInstallerSession;
-import android.content.pm.InstallSessionInfo;
-import android.content.pm.InstallSessionParams;
import android.content.pm.PackageInstaller;
+import android.content.pm.PackageInstaller.SessionInfo;
+import android.content.pm.PackageInstaller.SessionParams;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Binder;
+import android.os.Bundle;
import android.os.Environment;
+import android.os.Environment.UserEnvironment;
import android.os.FileUtils;
import android.os.Handler;
import android.os.HandlerThread;
@@ -61,8 +68,10 @@
import android.os.SELinux;
import android.os.UserHandle;
import android.os.UserManager;
+import android.os.storage.StorageManager;
import android.system.ErrnoException;
import android.system.Os;
+import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.ArraySet;
import android.util.AtomicFile;
@@ -70,13 +79,14 @@
import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
+import android.util.SparseBooleanArray;
import android.util.Xml;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.content.PackageHelper;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.IoThread;
-import com.android.server.pm.PackageInstallerSession.Snapshot;
import com.google.android.collect.Sets;
import libcore.io.IoUtils;
@@ -103,6 +113,7 @@
// TODO: remove outstanding sessions when installer package goes away
// TODO: notify listeners in other users when package has been installed there
+ // TODO: purge expired sessions periodically in addition to at reboot
/** XML constants used in {@link #mSessionsFile} */
private static final String TAG_SESSIONS = "sessions";
@@ -112,6 +123,7 @@
private static final String ATTR_INSTALLER_PACKAGE_NAME = "installerPackageName";
private static final String ATTR_CREATED_MILLIS = "createdMillis";
private static final String ATTR_SESSION_STAGE_DIR = "sessionStageDir";
+ private static final String ATTR_SESSION_STAGE_CID = "sessionStageCid";
private static final String ATTR_SEALED = "sealed";
private static final String ATTR_MODE = "mode";
private static final String ATTR_INSTALL_FLAGS = "installFlags";
@@ -134,6 +146,7 @@
private final Context mContext;
private final PackageManagerService mPm;
private final AppOpsManager mAppOps;
+ private final StorageManager mStorage;
private final File mStagingDir;
private final HandlerThread mInstallThread;
@@ -160,10 +173,14 @@
@GuardedBy("mSessions")
private final SparseArray<PackageInstallerSession> mHistoricalSessions = new SparseArray<>();
+ /** Sessions allocated to legacy users */
+ @GuardedBy("mSessions")
+ private final SparseBooleanArray mLegacySessions = new SparseBooleanArray();
+
private static final FilenameFilter sStageFilter = new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
- return name.startsWith("vmdl") && name.endsWith(".tmp");
+ return isStageName(name);
}
};
@@ -171,6 +188,7 @@
mContext = context;
mPm = pm;
mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
+ mStorage = StorageManager.from(mContext);
mStagingDir = stagingDir;
@@ -185,13 +203,16 @@
synchronized (mSessions) {
readSessionsLocked();
- // Clean up orphaned staging directories
- final ArraySet<File> stages = Sets.newArraySet(mStagingDir.listFiles(sStageFilter));
+ final ArraySet<File> unclaimed = Sets.newArraySet(mStagingDir.listFiles(sStageFilter));
+
+ // Ignore stages claimed by active sessions
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
- stages.remove(session.sessionStageDir);
+ unclaimed.remove(session.internalStageDir);
}
- for (File stage : stages) {
+
+ // Clean up orphaned staging directories
+ for (File stage : unclaimed) {
Slog.w(TAG, "Deleting orphan stage " + stage);
if (stage.isDirectory()) {
FileUtils.deleteContents(stage);
@@ -201,22 +222,64 @@
}
}
- public static boolean isStageFile(File file) {
- return sStageFilter.accept(null, file.getName());
+ public void onSecureContainersAvailable() {
+ synchronized (mSessions) {
+ final ArraySet<String> unclaimed = new ArraySet<>();
+ for (String cid : PackageHelper.getSecureContainerList()) {
+ if (isStageName(cid)) {
+ unclaimed.add(cid);
+ }
+ }
+
+ // Ignore stages claimed by active sessions
+ for (int i = 0; i < mSessions.size(); i++) {
+ final PackageInstallerSession session = mSessions.valueAt(i);
+ final String cid = session.externalStageCid;
+
+ if (unclaimed.remove(cid)) {
+ // Claimed by active session, mount it
+ PackageHelper.mountSdDir(cid, PackageManagerService.getEncryptKey(),
+ Process.SYSTEM_UID);
+ }
+ }
+
+ // Clean up orphaned staging containers
+ for (String cid : unclaimed) {
+ Slog.w(TAG, "Deleting orphan container " + cid);
+ PackageHelper.destroySdDir(cid);
+ }
+ }
+ }
+
+ public static boolean isStageName(String name) {
+ final boolean isFile = name.startsWith("vmdl") && name.endsWith(".tmp");
+ final boolean isContainer = name.startsWith("smdl") && name.endsWith(".tmp");
+ final boolean isLegacyContainer = name.startsWith("smdl2tmp");
+ return isFile || isContainer || isLegacyContainer;
}
@Deprecated
- public File allocateSessionDir() throws IOException {
+ public File allocateInternalStageDirLegacy() throws IOException {
synchronized (mSessions) {
try {
final int sessionId = allocateSessionIdLocked();
- return prepareSessionStageDir(sessionId);
+ mLegacySessions.put(sessionId, true);
+ return prepareInternalStageDir(sessionId);
} catch (IllegalStateException e) {
throw new IOException(e);
}
}
}
+ @Deprecated
+ public String allocateExternalStageCidLegacy() {
+ synchronized (mSessions) {
+ final int sessionId = allocateSessionIdLocked();
+ mLegacySessions.put(sessionId, true);
+ return "smdl" + sessionId + ".tmp";
+ }
+ }
+
private void readSessionsLocked() {
if (LOGD) Slog.v(TAG, "readSessionsLocked()");
@@ -241,9 +304,10 @@
Slog.w(TAG, "Abandoning old session first created at "
+ session.createdMillis);
valid = false;
- } else if (!session.sessionStageDir.exists()) {
- Slog.w(TAG, "Abandoning session with missing stage "
- + session.sessionStageDir);
+ } else if (session.internalStageDir != null
+ && !session.internalStageDir.exists()) {
+ Slog.w(TAG, "Abandoning internal session with missing stage "
+ + session.internalStageDir);
valid = false;
} else {
valid = true;
@@ -276,11 +340,13 @@
final int userId = readIntAttribute(in, ATTR_USER_ID);
final String installerPackageName = readStringAttribute(in, ATTR_INSTALLER_PACKAGE_NAME);
final long createdMillis = readLongAttribute(in, ATTR_CREATED_MILLIS);
- final File sessionStageDir = new File(readStringAttribute(in, ATTR_SESSION_STAGE_DIR));
+ final String stageDirRaw = readStringAttribute(in, ATTR_SESSION_STAGE_DIR);
+ final File stageDir = (stageDirRaw != null) ? new File(stageDirRaw) : null;
+ final String stageCid = readStringAttribute(in, ATTR_SESSION_STAGE_CID);
final boolean sealed = readBooleanAttribute(in, ATTR_SEALED);
- final InstallSessionParams params = new InstallSessionParams(
- InstallSessionParams.MODE_INVALID);
+ final SessionParams params = new SessionParams(
+ SessionParams.MODE_INVALID);
params.mode = readIntAttribute(in, ATTR_MODE);
params.installFlags = readIntAttribute(in, ATTR_INSTALL_FLAGS);
params.installLocation = readIntAttribute(in, ATTR_INSTALL_LOCATION);
@@ -292,9 +358,9 @@
params.referrerUri = readUriAttribute(in, ATTR_REFERRER_URI);
params.abiOverride = readStringAttribute(in, ATTR_ABI_OVERRIDE);
- return new PackageInstallerSession(mInternalCallback, mPm, mInstallThread.getLooper(),
- sessionId, userId, installerPackageName, params, createdMillis, sessionStageDir,
- sealed);
+ return new PackageInstallerSession(mInternalCallback, mContext, mPm,
+ mInstallThread.getLooper(), sessionId, userId, installerPackageName, params,
+ createdMillis, stageDir, stageCid, sealed);
}
private void writeSessionsLocked() {
@@ -326,8 +392,7 @@
private void writeSessionLocked(XmlSerializer out, PackageInstallerSession session)
throws IOException {
- final InstallSessionParams params = session.params;
- final Snapshot snapshot = session.snapshot();
+ final SessionParams params = session.params;
out.startTag(null, TAG_SESSION);
@@ -336,9 +401,14 @@
writeStringAttribute(out, ATTR_INSTALLER_PACKAGE_NAME,
session.installerPackageName);
writeLongAttribute(out, ATTR_CREATED_MILLIS, session.createdMillis);
- writeStringAttribute(out, ATTR_SESSION_STAGE_DIR,
- session.sessionStageDir.getAbsolutePath());
- writeBooleanAttribute(out, ATTR_SEALED, snapshot.sealed);
+ if (session.internalStageDir != null) {
+ writeStringAttribute(out, ATTR_SESSION_STAGE_DIR,
+ session.internalStageDir.getAbsolutePath());
+ }
+ if (session.externalStageCid != null) {
+ writeStringAttribute(out, ATTR_SESSION_STAGE_CID, session.externalStageCid);
+ }
+ writeBooleanAttribute(out, ATTR_SEALED, session.isSealed());
writeIntAttribute(out, ATTR_MODE, params.mode);
writeIntAttribute(out, ATTR_INSTALL_FLAGS, params.installFlags);
@@ -366,7 +436,16 @@
}
@Override
- public int createSession(InstallSessionParams params, String installerPackageName, int userId) {
+ public int createSession(SessionParams params, String installerPackageName, int userId) {
+ try {
+ return createSessionInternal(params, installerPackageName, userId);
+ } catch (IOException e) {
+ throw ExceptionUtils.wrap(e);
+ }
+ }
+
+ private int createSessionInternal(SessionParams params, String installerPackageName, int userId)
+ throws IOException {
final int callingUid = Binder.getCallingUid();
mPm.enforceCrossUserPermission(callingUid, userId, true, "createSession");
@@ -388,14 +467,6 @@
params.installFlags |= INSTALL_REPLACE_EXISTING;
}
- switch (params.mode) {
- case InstallSessionParams.MODE_FULL_INSTALL:
- case InstallSessionParams.MODE_INHERIT_EXISTING:
- break;
- default:
- throw new IllegalArgumentException("Params must have valid mode set");
- }
-
// Defensively resize giant app icons
if (params.appIcon != null) {
final ActivityManager am = (ActivityManager) mContext.getSystemService(
@@ -408,13 +479,42 @@
}
}
- // Sanity check that install could fit
- if (params.sizeBytes > 0) {
- try {
- mPm.freeStorage(params.sizeBytes);
- } catch (IOException e) {
- throw ExceptionUtils.wrap(e);
+ // Figure out where we're going to be staging session data
+ final boolean stageInternal;
+
+ if (params.mode == SessionParams.MODE_FULL_INSTALL) {
+ // Brand new install, use best resolved location. This also verifies
+ // that target has enough free space for the install.
+ final int resolved = PackageHelper.resolveInstallLocation(mContext,
+ params.appPackageName, params.installLocation, params.sizeBytes,
+ params.installFlags);
+ if (resolved == PackageHelper.RECOMMEND_INSTALL_INTERNAL) {
+ stageInternal = true;
+ } else if (resolved == PackageHelper.RECOMMEND_INSTALL_EXTERNAL) {
+ stageInternal = false;
+ } else {
+ throw new IOException("No storage with enough free space; res=" + resolved);
}
+
+ } else if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {
+ // We always stage inheriting sessions on internal storage first,
+ // since we don't want to grow containers until we're sure that
+ // everything looks legit.
+ stageInternal = true;
+ checkInternalStorage(params.sizeBytes);
+
+ // If we have a good hunch we'll end up on external storage, verify
+ // free space there too.
+ final ApplicationInfo info = mPm.getApplicationInfo(params.appPackageName, 0,
+ userId);
+ if (info != null && (info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ checkExternalStorage(params.sizeBytes);
+
+ throw new UnsupportedOperationException("TODO: finish fleshing out ASEC support");
+ }
+
+ } else {
+ throw new IllegalArgumentException("Invalid install mode: " + params.mode);
}
final int sessionId;
@@ -432,14 +532,21 @@
"Too many historical sessions for UID " + callingUid);
}
+ final long createdMillis = System.currentTimeMillis();
sessionId = allocateSessionIdLocked();
- final long createdMillis = System.currentTimeMillis();
- final File sessionStageDir = prepareSessionStageDir(sessionId);
+ // We're staging to exactly one location
+ File stageDir = null;
+ String stageCid = null;
+ if (stageInternal) {
+ stageDir = prepareInternalStageDir(sessionId);
+ } else {
+ stageCid = prepareExternalStageCid(sessionId, params.sizeBytes);
+ }
- session = new PackageInstallerSession(mInternalCallback, mPm,
+ session = new PackageInstallerSession(mInternalCallback, mContext, mPm,
mInstallThread.getLooper(), sessionId, userId, installerPackageName, params,
- createdMillis, sessionStageDir, false);
+ createdMillis, stageDir, stageCid, false);
mSessions.put(sessionId, session);
}
@@ -448,6 +555,30 @@
return sessionId;
}
+ private void checkInternalStorage(long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) return;
+
+ final File target = Environment.getDataDirectory();
+ final long targetBytes = sizeBytes + mStorage.getStorageLowBytes(target);
+
+ mPm.freeStorage(targetBytes);
+ if (target.getUsableSpace() < targetBytes) {
+ throw new IOException("Not enough internal space to write " + sizeBytes + " bytes");
+ }
+ }
+
+ private void checkExternalStorage(long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) return;
+
+ final File target = new UserEnvironment(UserHandle.USER_OWNER)
+ .getExternalStorageDirectory();
+ final long targetBytes = sizeBytes + mStorage.getStorageLowBytes(target);
+
+ if (target.getUsableSpace() < targetBytes) {
+ throw new IOException("Not enough external space to write " + sizeBytes + " bytes");
+ }
+ }
+
@Override
public IPackageInstallerSession openSession(int sessionId) {
synchronized (mSessions) {
@@ -458,9 +589,7 @@
if (!isCallingUidOwner(session)) {
throw new SecurityException("Caller has no access to session " + sessionId);
}
- if (session.openCount.getAndIncrement() == 0) {
- mCallbacks.notifySessionOpened(sessionId, session.userId);
- }
+ session.open();
return session;
}
}
@@ -470,7 +599,8 @@
int sessionId;
do {
sessionId = mRandom.nextInt(Integer.MAX_VALUE - 1) + 1;
- if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null) {
+ if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null
+ && !mLegacySessions.get(sessionId, false)) {
return sessionId;
}
} while (n++ < 32);
@@ -478,11 +608,11 @@
throw new IllegalStateException("Failed to allocate session ID");
}
- private File prepareSessionStageDir(int sessionId) {
+ private File prepareInternalStageDir(int sessionId) throws IOException {
final File file = new File(mStagingDir, "vmdl" + sessionId + ".tmp");
if (file.exists()) {
- throw new IllegalStateException("Session dir already exists: " + file);
+ throw new IOException("Session dir already exists: " + file);
}
try {
@@ -490,18 +620,36 @@
Os.chmod(file.getAbsolutePath(), 0755);
} catch (ErrnoException e) {
// This purposefully throws if directory already exists
- throw new IllegalStateException("Failed to prepare session dir", e);
+ throw new IOException("Failed to prepare session dir", e);
}
if (!SELinux.restorecon(file)) {
- throw new IllegalStateException("Failed to restorecon session dir");
+ throw new IOException("Failed to restorecon session dir");
}
return file;
}
+ private String prepareExternalStageCid(int sessionId, long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) {
+ throw new IOException("Session must provide valid size for ASEC");
+ }
+
+ final String cid = "smdl" + sessionId + ".tmp";
+
+ // Round up to nearest MB, plus another MB for filesystem overhead
+ final int sizeMb = (int) ((sizeBytes + MB_IN_BYTES) / MB_IN_BYTES) + 1;
+
+ if (PackageHelper.createSdDir(sizeMb, cid, PackageManagerService.getEncryptKey(),
+ Process.SYSTEM_UID, true) == null) {
+ throw new IOException("Failed to create ASEC");
+ }
+
+ return cid;
+ }
+
@Override
- public InstallSessionInfo getSessionInfo(int sessionId) {
+ public SessionInfo getSessionInfo(int sessionId) {
synchronized (mSessions) {
final PackageInstallerSession session = mSessions.get(sessionId);
if (!isCallingUidOwner(session)) {
@@ -512,11 +660,11 @@
}
@Override
- public List<InstallSessionInfo> getAllSessions(int userId) {
+ public List<SessionInfo> getAllSessions(int userId) {
mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, "getAllSessions");
enforceCallerCanReadSessions();
- final List<InstallSessionInfo> result = new ArrayList<>();
+ final List<SessionInfo> result = new ArrayList<>();
synchronized (mSessions) {
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
@@ -529,11 +677,11 @@
}
@Override
- public List<InstallSessionInfo> getMySessions(String installerPackageName, int userId) {
+ public List<SessionInfo> getMySessions(String installerPackageName, int userId) {
mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, "getMySessions");
mAppOps.checkPackage(Binder.getCallingUid(), installerPackageName);
- final List<InstallSessionInfo> result = new ArrayList<>();
+ final List<SessionInfo> result = new ArrayList<>();
synchronized (mSessions) {
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
@@ -547,37 +695,26 @@
}
@Override
- public void uninstall(String packageName, int flags, IPackageDeleteObserver2 observer,
- int userId) {
+ public void uninstall(String packageName, int flags, IntentSender statusReceiver, int userId) {
mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, "uninstall");
+ final PackageDeleteObserverAdapter adapter = new PackageDeleteObserverAdapter(mContext,
+ statusReceiver, packageName);
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DELETE_PACKAGES)
== PackageManager.PERMISSION_GRANTED) {
// Sweet, call straight through!
- mPm.deletePackage(packageName, observer, userId, flags);
+ mPm.deletePackage(packageName, adapter.getBinder(), userId, flags);
} else {
// Take a short detour to confirm with user
final Intent intent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE);
intent.setData(Uri.fromParts("package", packageName, null));
- intent.putExtra(PackageInstaller.EXTRA_CALLBACK, observer.asBinder());
- try {
- observer.onUserActionRequired(intent);
- } catch (RemoteException ignored) {
- }
+ intent.putExtra(PackageInstaller.EXTRA_CALLBACK, adapter.getBinder().asBinder());
+ adapter.onUserActionRequired(intent);
}
}
@Override
- public void uninstallSplit(String basePackageName, String overlayName, int flags,
- IPackageDeleteObserver2 observer, int userId) {
- mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, "uninstallSplit");
-
- // TODO: flesh out once PM has split support
- throw new UnsupportedOperationException();
- }
-
- @Override
public void setPermissionsResult(int sessionId, boolean accepted) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.INSTALL_PACKAGES, TAG);
@@ -636,6 +773,95 @@
}
}
+ static class PackageDeleteObserverAdapter extends PackageDeleteObserver {
+ private final Context mContext;
+ private final IntentSender mTarget;
+ private final String mPackageName;
+
+ public PackageDeleteObserverAdapter(Context context, IntentSender target,
+ String packageName) {
+ mContext = context;
+ mTarget = target;
+ mPackageName = packageName;
+ }
+
+ @Override
+ public void onUserActionRequired(Intent intent) {
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, mPackageName);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageInstaller.STATUS_PENDING_USER_ACTION);
+ fillIn.putExtra(Intent.EXTRA_INTENT, intent);
+ try {
+ mTarget.sendIntent(mContext, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
+ }
+ }
+
+ @Override
+ public void onPackageDeleted(String basePackageName, int returnCode, String msg) {
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, mPackageName);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageManager.deleteStatusToPublicStatus(returnCode));
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE,
+ PackageManager.deleteStatusToString(returnCode, msg));
+ fillIn.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, returnCode);
+ try {
+ mTarget.sendIntent(mContext, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
+ }
+ }
+ }
+
+ static class PackageInstallObserverAdapter extends PackageInstallObserver {
+ private final Context mContext;
+ private final IntentSender mTarget;
+ private final int mSessionId;
+
+ public PackageInstallObserverAdapter(Context context, IntentSender target, int sessionId) {
+ mContext = context;
+ mTarget = target;
+ mSessionId = sessionId;
+ }
+
+ @Override
+ public void onUserActionRequired(Intent intent) {
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageInstaller.STATUS_PENDING_USER_ACTION);
+ fillIn.putExtra(Intent.EXTRA_INTENT, intent);
+ try {
+ mTarget.sendIntent(mContext, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
+ }
+ }
+
+ @Override
+ public void onPackageInstalled(String basePackageName, int returnCode, String msg,
+ Bundle extras) {
+ final Intent fillIn = new Intent();
+ fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
+ PackageManager.installStatusToPublicStatus(returnCode));
+ fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE,
+ PackageManager.installStatusToString(returnCode, msg));
+ fillIn.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, returnCode);
+ if (extras != null) {
+ final String existing = extras.getString(
+ PackageManager.EXTRA_FAILURE_EXISTING_PACKAGE);
+ if (!TextUtils.isEmpty(existing)) {
+ fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, existing);
+ }
+ }
+ try {
+ mTarget.sendIntent(mContext, 0, fillIn, null, null);
+ } catch (SendIntentException ignored) {
+ }
+ }
+ }
+
private static class Callbacks extends Handler {
private static final int MSG_SESSION_CREATED = 1;
private static final int MSG_SESSION_OPENED = 2;
@@ -742,6 +968,11 @@
}
pw.println();
pw.decreaseIndent();
+
+ pw.println("Legacy install sessions:");
+ pw.increaseIndent();
+ pw.println(mLegacySessions.toString());
+ pw.decreaseIndent();
}
}
@@ -750,6 +981,10 @@
mCallbacks.notifySessionProgressChanged(session.sessionId, session.userId, progress);
}
+ public void onSessionOpened(PackageInstallerSession session) {
+ mCallbacks.notifySessionOpened(session.sessionId, session.userId);
+ }
+
public void onSessionClosed(PackageInstallerSession session) {
mCallbacks.notifySessionClosed(session.sessionId, session.userId);
}
@@ -762,5 +997,12 @@
}
writeSessionsAsync();
}
+
+ public void onSessionSealed(PackageInstallerSession session) {
+ // It's very important that we block until we've recorded the
+ // session as being sealed, since we never want to allow mutation
+ // after sealing.
+ writeSessionsLocked();
+ }
}
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index a3184f0..38a2016 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -18,6 +18,7 @@
import static android.content.pm.PackageManager.INSTALL_FAILED_ABORTED;
import static android.content.pm.PackageManager.INSTALL_FAILED_ALREADY_EXISTS;
+import static android.content.pm.PackageManager.INSTALL_FAILED_CONTAINER_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK;
import static android.content.pm.PackageManager.INSTALL_FAILED_PACKAGE_CHANGED;
@@ -25,13 +26,15 @@
import static android.system.OsConstants.O_RDONLY;
import static android.system.OsConstants.O_WRONLY;
+import android.content.Context;
import android.content.Intent;
+import android.content.IntentSender;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageInstallObserver2;
import android.content.pm.IPackageInstallerSession;
-import android.content.pm.InstallSessionInfo;
-import android.content.pm.InstallSessionParams;
import android.content.pm.PackageInstaller;
+import android.content.pm.PackageInstaller.SessionInfo;
+import android.content.pm.PackageInstaller.SessionParams;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
import android.content.pm.PackageParser.ApkLite;
@@ -56,9 +59,11 @@
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.content.PackageHelper;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
+import com.android.server.pm.PackageInstallerService.PackageInstallObserverAdapter;
import libcore.io.Libcore;
@@ -76,25 +81,37 @@
// TODO: enforce INSTALL_ALLOW_TEST
// TODO: enforce INSTALL_ALLOW_DOWNGRADE
- // TODO: handle INSTALL_EXTERNAL, INSTALL_INTERNAL
// TODO: treat INHERIT_EXISTING as installExistingPackage()
private final PackageInstallerService.InternalCallback mCallback;
+ private final Context mContext;
private final PackageManagerService mPm;
private final Handler mHandler;
final int sessionId;
final int userId;
final String installerPackageName;
- final InstallSessionParams params;
+ final SessionParams params;
final long createdMillis;
- final File sessionStageDir;
+
+ /** Internal location where staged data is written. */
+ final File internalStageDir;
+ /** External container where staged data is written. */
+ final String externalStageCid;
+
+ /**
+ * When a {@link SessionParams#MODE_INHERIT_EXISTING} session is installed
+ * into an ASEC, this is the container where the stage is combined with the
+ * existing install.
+ */
+ // TODO: persist this cid once we start splicing
+ String combinedCid;
/** Note that UID is not persisted; it's always derived at runtime. */
final int installerUid;
- AtomicInteger openCount = new AtomicInteger();
+ private final AtomicInteger mOpenCount = new AtomicInteger();
private final Object mLock = new Object();
@@ -115,6 +132,9 @@
private int mFinalStatus;
private String mFinalMessage;
+ @GuardedBy("mLock")
+ private File mResolvedStageDir;
+
/**
* Path to the resolved base APK for this session, which may point at an APK
* inside the session (when the session defines the base), or it may point
@@ -159,10 +179,11 @@
};
public PackageInstallerSession(PackageInstallerService.InternalCallback callback,
- PackageManagerService pm, Looper looper, int sessionId, int userId,
- String installerPackageName, InstallSessionParams params, long createdMillis,
- File sessionStageDir, boolean sealed) {
+ Context context, PackageManagerService pm, Looper looper, int sessionId, int userId,
+ String installerPackageName, SessionParams params, long createdMillis,
+ File internalStageDir, String externalStageCid, boolean sealed) {
mCallback = callback;
+ mContext = context;
mPm = pm;
mHandler = new Handler(looper, mHandlerCallback);
@@ -171,7 +192,13 @@
this.installerPackageName = installerPackageName;
this.params = params;
this.createdMillis = createdMillis;
- this.sessionStageDir = sessionStageDir;
+ this.internalStageDir = internalStageDir;
+ this.externalStageCid = externalStageCid;
+
+ if ((internalStageDir == null) == (externalStageCid == null)) {
+ throw new IllegalArgumentException(
+ "Exactly one of internal or external stage must be set");
+ }
mSealed = sealed;
@@ -188,25 +215,31 @@
computeProgressLocked();
}
- public InstallSessionInfo generateInfo() {
- final InstallSessionInfo info = new InstallSessionInfo();
+ public SessionInfo generateInfo() {
+ final SessionInfo info = new SessionInfo();
+ synchronized (mLock) {
+ info.sessionId = sessionId;
+ info.installerPackageName = installerPackageName;
+ info.resolvedBaseCodePath = mResolvedBaseCodePath;
+ info.progress = mProgress;
+ info.sealed = mSealed;
+ info.open = mOpenCount.get() > 0;
- info.sessionId = sessionId;
- info.installerPackageName = installerPackageName;
- info.resolvedBaseCodePath = mResolvedBaseCodePath;
- info.progress = mProgress;
- info.sealed = mSealed;
- info.open = openCount.get() > 0;
-
- info.mode = params.mode;
- info.sizeBytes = params.sizeBytes;
- info.appPackageName = params.appPackageName;
- info.appIcon = params.appIcon;
- info.appLabel = params.appLabel;
-
+ info.mode = params.mode;
+ info.sizeBytes = params.sizeBytes;
+ info.appPackageName = params.appPackageName;
+ info.appIcon = params.appIcon;
+ info.appLabel = params.appLabel;
+ }
return info;
}
+ public boolean isSealed() {
+ synchronized (mLock) {
+ return mSealed;
+ }
+ }
+
private void assertNotSealed(String cookie) {
synchronized (mLock) {
if (mSealed) {
@@ -215,6 +248,30 @@
}
}
+ /**
+ * Resolve the actual location where staged data should be written. This
+ * might point at an ASEC mount point, which is why we delay path resolution
+ * until someone actively works with the session.
+ */
+ private File getStageDir() throws IOException {
+ synchronized (mLock) {
+ if (mResolvedStageDir == null) {
+ if (internalStageDir != null) {
+ mResolvedStageDir = internalStageDir;
+ } else {
+ final String path = PackageHelper.getSdDir(externalStageCid);
+ if (path != null) {
+ mResolvedStageDir = new File(path);
+ } else {
+ throw new IOException(
+ "Failed to resolve container path for " + externalStageCid);
+ }
+ }
+ }
+ return mResolvedStageDir;
+ }
+ }
+
@Override
public void setClientProgress(float progress) {
synchronized (mLock) {
@@ -246,9 +303,13 @@
}
@Override
- public String[] list() {
- assertNotSealed("list");
- return sessionStageDir.list();
+ public String[] getNames() {
+ assertNotSealed("getNames");
+ try {
+ return getStageDir().list();
+ } catch (IOException e) {
+ throw ExceptionUtils.wrap(e);
+ }
}
@Override
@@ -262,8 +323,6 @@
private ParcelFileDescriptor openWriteInternal(String name, long offsetBytes, long lengthBytes)
throws IOException {
- // TODO: relay over to DCS when installing to ASEC
-
// Quick sanity check of state, and allocate a pipe for ourselves. We
// then do heavy disk allocation outside the lock, but this open pipe
// will block any attempted install transitions.
@@ -280,7 +339,7 @@
if (!FileUtils.isValidExtFilename(name)) {
throw new IllegalArgumentException("Invalid name: " + name);
}
- final File target = new File(sessionStageDir, name);
+ final File target = new File(getStageDir(), name);
final FileDescriptor targetFd = Libcore.os.open(target.getAbsolutePath(),
O_CREAT | O_WRONLY, 0644);
@@ -326,7 +385,7 @@
if (!FileUtils.isValidExtFilename(name)) {
throw new IllegalArgumentException("Invalid name: " + name);
}
- final File target = new File(sessionStageDir, name);
+ final File target = new File(getStageDir(), name);
final FileDescriptor targetFd = Libcore.os.open(target.getAbsolutePath(), O_RDONLY, 0);
return new ParcelFileDescriptor(targetFd);
@@ -337,9 +396,12 @@
}
@Override
- public void commit(IPackageInstallObserver2 observer) {
- Preconditions.checkNotNull(observer);
- mHandler.obtainMessage(MSG_COMMIT, observer).sendToTarget();
+ public void commit(IntentSender statusReceiver) {
+ Preconditions.checkNotNull(statusReceiver);
+
+ final PackageInstallObserverAdapter adapter = new PackageInstallObserverAdapter(mContext,
+ statusReceiver, sessionId);
+ mHandler.obtainMessage(MSG_COMMIT, adapter.getBinder()).sendToTarget();
}
private void commitLocked() throws PackageManagerException {
@@ -357,14 +419,23 @@
}
mSealed = true;
- // TODO: persist disabled mutations before going forward, since
- // beyond this point we may have hardlinks to the valid install
+ // Persist the fact that we've sealed ourselves to prevent mutations
+ // of any hard links we create below.
+ mCallback.onSessionSealed(this);
+ }
+
+ final File stageDir;
+ try {
+ stageDir = getStageDir();
+ } catch (IOException e) {
+ throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,
+ "Failed to resolve stage dir", e);
}
// Verify that stage looks sane with respect to existing application.
// This currently only ensures packageName, versionCode, and certificate
// consistency.
- validateInstallLocked();
+ validateInstallLocked(stageDir);
Preconditions.checkNotNull(mPackageName);
Preconditions.checkNotNull(mSignatures);
@@ -385,8 +456,9 @@
// Inherit any packages and native libraries from existing install that
// haven't been overridden.
- if (params.mode == InstallSessionParams.MODE_INHERIT_EXISTING) {
- spliceExistingFilesIntoStage();
+ if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {
+ // TODO: implement splicing into existing ASEC
+ spliceExistingFilesIntoStage(stageDir);
}
// TODO: surface more granular state from dexopt
@@ -396,7 +468,6 @@
// We've reached point of no return; call into PMS to install the stage.
// Regardless of success or failure we always destroy session.
- final IPackageInstallObserver2 remoteObserver = mRemoteObserver;
final IPackageInstallObserver2 localObserver = new IPackageInstallObserver2.Stub() {
@Override
public void onUserActionRequired(Intent intent) {
@@ -411,8 +482,8 @@
}
};
- mPm.installStage(mPackageName, this.sessionStageDir, localObserver, params,
- installerPackageName, installerUid, new UserHandle(userId));
+ mPm.installStage(mPackageName, this.internalStageDir, this.externalStageCid, localObserver,
+ params, installerPackageName, installerUid, new UserHandle(userId));
}
/**
@@ -420,25 +491,32 @@
* consistent package name, version code, and signing certificates.
* <p>
* Renames package files in stage to match split names defined inside.
+ * <p>
+ * Note that upgrade compatibility is still performed by
+ * {@link PackageManagerService}.
*/
- private void validateInstallLocked() throws PackageManagerException {
+ private void validateInstallLocked(File stageDir) throws PackageManagerException {
mPackageName = null;
mVersionCode = -1;
mSignatures = null;
mResolvedBaseCodePath = null;
- final File[] files = sessionStageDir.listFiles();
+ final File[] files = stageDir.listFiles();
if (ArrayUtils.isEmpty(files)) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
}
- final ArraySet<String> seenSplits = new ArraySet<>();
-
// Verify that all staged packages are internally consistent
+ final ArraySet<String> seenSplits = new ArraySet<>();
for (File file : files) {
+
+ // Installers can't stage directories, so it's fine to ignore
+ // entries like "lost+found".
+ if (file.isDirectory()) continue;
+
final ApkLite info;
try {
- info = PackageParser.parseApkLite(file, PackageParser.PARSE_GET_SIGNATURES);
+ info = PackageParser.parseApkLite(file, PackageParser.PARSE_COLLECT_CERTIFICATES);
} catch (PackageParserException e) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
"Failed to parse " + file + ": " + e);
@@ -473,7 +551,7 @@
"Invalid filename: " + targetName);
}
- final File targetFile = new File(sessionStageDir, targetName);
+ final File targetFile = new File(stageDir, targetName);
if (!file.equals(targetFile)) {
file.renameTo(targetFile);
}
@@ -484,11 +562,7 @@
}
}
- // TODO: shift package signature verification to installer; we're
- // currently relying on PMS to do this.
- // TODO: teach about compatible upgrade keysets.
-
- if (params.mode == InstallSessionParams.MODE_FULL_INSTALL) {
+ if (params.mode == SessionParams.MODE_FULL_INSTALL) {
// Full installs must include a base package
if (!seenSplits.contains(null)) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
@@ -511,7 +585,7 @@
final ApkLite info;
try {
info = PackageParser.parseApkLite(new File(app.getBaseCodePath()),
- PackageParser.PARSE_GET_SIGNATURES);
+ PackageParser.PARSE_COLLECT_CERTIFICATES);
} catch (PackageParserException e) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
"Failed to parse existing base " + app.getBaseCodePath() + ": " + e);
@@ -543,7 +617,7 @@
* Application is already installed; splice existing files that haven't been
* overridden into our stage.
*/
- private void spliceExistingFilesIntoStage() throws PackageManagerException {
+ private void spliceExistingFilesIntoStage(File stageDir) throws PackageManagerException {
final ApplicationInfo app = mPm.getApplicationInfo(mPackageName, 0, userId);
int n = 0;
@@ -552,7 +626,7 @@
for (File oldFile : oldFiles) {
if (!PackageParser.isApkFile(oldFile)) continue;
- final File newFile = new File(sessionStageDir, oldFile.getName());
+ final File newFile = new File(stageDir, oldFile.getName());
try {
Os.link(oldFile.getAbsolutePath(), newFile.getAbsolutePath());
n++;
@@ -581,9 +655,15 @@
}
}
+ public void open() {
+ if (mOpenCount.getAndIncrement() == 0) {
+ mCallback.onSessionOpened(this);
+ }
+ }
+
@Override
public void close() {
- if (openCount.decrementAndGet() == 0) {
+ if (mOpenCount.decrementAndGet() == 0) {
mCallback.onSessionClosed(this);
}
}
@@ -614,11 +694,22 @@
mSealed = true;
mDestroyed = true;
}
- FileUtils.deleteContents(sessionStageDir);
- sessionStageDir.delete();
+ if (internalStageDir != null) {
+ FileUtils.deleteContents(internalStageDir);
+ internalStageDir.delete();
+ }
+ if (externalStageCid != null) {
+ PackageHelper.destroySdDir(externalStageCid);
+ }
}
void dump(IndentingPrintWriter pw) {
+ synchronized (mLock) {
+ dumpLocked(pw);
+ }
+ }
+
+ private void dumpLocked(IndentingPrintWriter pw) {
pw.println("Session " + sessionId + ":");
pw.increaseIndent();
@@ -626,7 +717,8 @@
pw.printPair("installerPackageName", installerPackageName);
pw.printPair("installerUid", installerUid);
pw.printPair("createdMillis", createdMillis);
- pw.printPair("sessionStageDir", sessionStageDir);
+ pw.printPair("internalStageDir", internalStageDir);
+ pw.printPair("externalStageCid", externalStageCid);
pw.println();
params.dump(pw);
@@ -643,18 +735,4 @@
pw.decreaseIndent();
}
-
- Snapshot snapshot() {
- return new Snapshot(this);
- }
-
- static class Snapshot {
- final float clientProgress;
- final boolean sealed;
-
- public Snapshot(PackageInstallerSession session) {
- clientProgress = session.mClientProgress;
- sealed = session.mSealed;
- }
- }
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 6be6b60..aa49b27 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -48,11 +48,6 @@
import static android.os.Process.SYSTEM_UID;
import static android.system.OsConstants.O_CREAT;
import static android.system.OsConstants.O_RDWR;
-import static android.system.OsConstants.S_IRGRP;
-import static android.system.OsConstants.S_IROTH;
-import static android.system.OsConstants.S_IRWXU;
-import static android.system.OsConstants.S_IXGRP;
-import static android.system.OsConstants.S_IXOTH;
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_USER_OWNER;
import static com.android.internal.util.ArrayUtils.appendInt;
@@ -70,7 +65,6 @@
import com.android.internal.util.FastPrintWriter;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.IndentingPrintWriter;
-import com.android.internal.util.Preconditions;
import com.android.server.EventLogTags;
import com.android.server.IntentResolver;
import com.android.server.LocalServices;
@@ -107,12 +101,12 @@
import android.content.pm.IPackageManager;
import android.content.pm.IPackageMoveObserver;
import android.content.pm.IPackageStatsObserver;
-import android.content.pm.InstallSessionParams;
import android.content.pm.InstrumentationInfo;
import android.content.pm.ManifestDigest;
import android.content.pm.PackageCleanItem;
import android.content.pm.PackageInfo;
import android.content.pm.PackageInfoLite;
+import android.content.pm.PackageInstaller;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.LegacyPackageDeleteObserver;
import android.content.pm.PackageParser.ActivityIntentInfo;
@@ -140,6 +134,7 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.Environment.UserEnvironment;
+import android.os.storage.StorageManager;
import android.os.FileUtils;
import android.os.Handler;
import android.os.IBinder;
@@ -211,6 +206,7 @@
import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
+import libcore.util.EmptyArray;
/**
* Keep track of all those .apks everywhere.
@@ -307,8 +303,6 @@
private static final String VENDOR_OVERLAY_DIR = "/vendor/overlay";
- static final String mTempContainerPrefix = "smdl2tmp";
-
private static String sPreferredInstructionSet;
final ServiceThread mHandlerThread;
@@ -1390,16 +1384,27 @@
* list of process files because dexopt will have been run
* if necessary during zygote startup.
*/
- String bootClassPath = System.getProperty("java.boot.class.path");
+ final String bootClassPath = System.getenv("BOOTCLASSPATH");
+ final String systemServerClassPath = System.getenv("SYSTEMSERVERCLASSPATH");
+
if (bootClassPath != null) {
- String[] paths = splitString(bootClassPath, ':');
- for (int i=0; i<paths.length; i++) {
- alreadyDexOpted.add(paths[i]);
+ String[] bootClassPathElements = splitString(bootClassPath, ':');
+ for (String element : bootClassPathElements) {
+ alreadyDexOpted.add(element);
}
} else {
Slog.w(TAG, "No BOOTCLASSPATH found!");
}
+ if (systemServerClassPath != null) {
+ String[] systemServerClassPathElements = splitString(systemServerClassPath, ':');
+ for (String element : systemServerClassPathElements) {
+ alreadyDexOpted.add(element);
+ }
+ } else {
+ Slog.w(TAG, "No SYSTEMSERVERCLASSPATH found!");
+ }
+
boolean didDexOptLibraryOrTool = false;
final List<String> allInstructionSets = getAllInstructionSets();
@@ -2916,7 +2921,8 @@
findPreferredActivity(intent, resolvedType,
flags, query, 0, false, true, false, userId);
// Add the new activity as the last chosen for this filter
- addPreferredActivityInternal(filter, match, null, activity, false, userId);
+ addPreferredActivityInternal(filter, match, null, activity, false, userId,
+ "Setting last chosen");
}
@Override
@@ -3188,24 +3194,22 @@
if (matches.get(i).getTargetUserId() == targetUserId) return true;
}
}
-
ArrayList<String> packageNames = null;
SparseArray<ArrayList<String>> fromSource =
mSettings.mCrossProfilePackageInfo.get(sourceUserId);
if (fromSource != null) {
packageNames = fromSource.get(targetUserId);
- }
- if (packageNames.contains(intent.getPackage())) {
- return true;
- }
- // We need the package name, so we try to resolve with the loosest flags possible
- List<ResolveInfo> resolveInfos = mActivities.queryIntent(
- intent, resolvedType, PackageManager.GET_UNINSTALLED_PACKAGES, targetUserId);
- int count = resolveInfos.size();
- for (int i = 0; i < count; i++) {
- ResolveInfo resolveInfo = resolveInfos.get(i);
- if (packageNames.contains(resolveInfo.activityInfo.packageName)) {
- return true;
+ if (packageNames != null) {
+ // We need the package name, so we try to resolve with the loosest flags possible
+ List<ResolveInfo> resolveInfos = mActivities.queryIntent(intent, resolvedType,
+ PackageManager.GET_UNINSTALLED_PACKAGES, targetUserId);
+ int count = resolveInfos.size();
+ for (int i = 0; i < count; i++) {
+ ResolveInfo resolveInfo = resolveInfos.get(i);
+ if (packageNames.contains(resolveInfo.activityInfo.packageName)) {
+ return true;
+ }
+ }
}
}
return false;
@@ -3278,6 +3282,7 @@
intent, resolvedType, flags, userId);
if (resolveInfo != null) {
result.add(resolveInfo);
+ Collections.sort(result, mResolvePrioritySorter);
}
return result;
}
@@ -4087,22 +4092,24 @@
for (File file : files) {
final boolean isPackage = (isApkFile(file) || file.isDirectory())
- && !PackageInstallerService.isStageFile(file);
+ && !PackageInstallerService.isStageName(file.getName());
if (!isPackage) {
- // Ignore entries which are not apk's
+ // Ignore entries which are not packages
continue;
}
try {
- scanPackageLI(file, flags | PackageParser.PARSE_MUST_BE_APK, scanMode, currentTime,
- null, null);
+ scanPackageLI(file, flags | PackageParser.PARSE_MUST_BE_APK,
+ scanMode, currentTime, null);
} catch (PackageManagerException e) {
Slog.w(TAG, "Failed to parse " + file + ": " + e.getMessage());
- // Don't mess around with apps in system partition.
+ // Delete invalid userdata apps
if ((flags & PackageParser.PARSE_IS_SYSTEM) == 0 &&
e.error == PackageManager.INSTALL_FAILED_INVALID_APK) {
- // Delete the apk
- Slog.w(TAG, "Cleaning up failed install of " + file);
+ Slog.w(TAG, "Deleting invalid package at " + file);
+ if (file.isDirectory()) {
+ FileUtils.deleteContents(file);
+ }
file.delete();
}
}
@@ -4175,7 +4182,7 @@
* Returns null in case of errors and the error code is stored in mLastScanError
*/
private PackageParser.Package scanPackageLI(File scanFile, int parseFlags, int scanMode,
- long currentTime, UserHandle user, String abiOverride) throws PackageManagerException {
+ long currentTime, UserHandle user) throws PackageManagerException {
if (DEBUG_INSTALL) Slog.d(TAG, "Parsing: " + scanFile);
parseFlags |= mDefParseFlags;
PackageParser pp = new PackageParser();
@@ -4371,7 +4378,7 @@
// Note that we invoke the following method only if we are about to unpack an application
PackageParser.Package scannedPkg = scanPackageLI(pkg, parseFlags, scanMode
- | SCAN_UPDATE_SIGNATURE, currentTime, user, abiOverride);
+ | SCAN_UPDATE_SIGNATURE, currentTime, user);
/*
* If the system app should be overridden by a previously installed
@@ -4998,8 +5005,26 @@
return res;
}
+ /**
+ * Derive the value of the {@code cpuAbiOverride} based on the provided
+ * value and an optional stored value from the package settings.
+ */
+ private static String deriveAbiOverride(String abiOverride, PackageSetting settings) {
+ String cpuAbiOverride = null;
+
+ if (NativeLibraryHelper.CLEAR_ABI_OVERRIDE.equals(abiOverride)) {
+ cpuAbiOverride = null;
+ } else if (abiOverride != null) {
+ cpuAbiOverride = abiOverride;
+ } else if (settings != null) {
+ cpuAbiOverride = settings.cpuAbiOverrideString;
+ }
+
+ return cpuAbiOverride;
+ }
+
private PackageParser.Package scanPackageLI(PackageParser.Package pkg, int parseFlags,
- int scanMode, long currentTime, UserHandle user, String abiOverride)
+ int scanMode, long currentTime, UserHandle user)
throws PackageManagerException {
final File scanFile = new File(pkg.codePath);
if (pkg.applicationInfo.getCodePath() == null ||
@@ -5155,7 +5180,7 @@
Slog.w(TAG, "Package " + pkg.packageName
+ " was transferred to another, but its .apk remains");
}
-
+
// Just create the setting, don't add it yet. For already existing packages
// the PkgSetting exists already and doesn't have to be created.
pkgSetting = mSettings.getPackageLPw(pkg, origPackage, realName, suid, destCodeFile,
@@ -5435,14 +5460,8 @@
final String path = scanFile.getPath();
final String codePath = pkg.applicationInfo.getCodePath();
+ final String cpuAbiOverride = deriveAbiOverride(pkg.cpuAbiOverride, pkgSetting);
if (isSystemApp(pkg) && !isUpdatedSystemApp(pkg)) {
- // For the case where we had previously uninstalled an update, get rid
- // of any native binaries we might have unpackaged. Note that this assumes
- // that system app updates were not installed via ASEC.
- //
- // TODO(multiArch): Is this cleanup really necessary ?
- NativeLibraryHelper.removeNativeBinariesFromDirLI(
- new File(codePath, LIB_DIR_NAME), false /* delete dirs */);
setBundledAppAbisAndRoots(pkg, pkgSetting);
// If we haven't found any native libraries for the app, check if it has
@@ -5497,7 +5516,8 @@
// Warn if we've set an abiOverride for multi-lib packages..
// By definition, we need to copy both 32 and 64 bit libraries for
// such packages.
- if (abiOverride != null) {
+ if (pkg.cpuAbiOverride != null
+ && !NativeLibraryHelper.CLEAR_ABI_OVERRIDE.equals(pkg.cpuAbiOverride)) {
Slog.w(TAG, "Ignoring abiOverride for multi arch application.");
}
@@ -5507,7 +5527,7 @@
if (isAsec) {
abi32 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_32_BIT_ABIS);
} else {
- abi32 = copyNativeLibrariesForInternalApp(handle,
+ abi32 = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle,
nativeLibraryRoot, Build.SUPPORTED_32_BIT_ABIS, useIsaSpecificSubdirs);
}
}
@@ -5519,7 +5539,7 @@
if (isAsec) {
abi64 = NativeLibraryHelper.findSupportedAbi(handle, Build.SUPPORTED_64_BIT_ABIS);
} else {
- abi64 = copyNativeLibrariesForInternalApp(handle,
+ abi64 = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle,
nativeLibraryRoot, Build.SUPPORTED_64_BIT_ABIS, useIsaSpecificSubdirs);
}
}
@@ -5540,15 +5560,15 @@
}
}
} else {
- String[] abiList = (abiOverride != null) ?
- new String[] { abiOverride } : Build.SUPPORTED_ABIS;
+ String[] abiList = (cpuAbiOverride != null) ?
+ new String[] { cpuAbiOverride } : Build.SUPPORTED_ABIS;
// Enable gross and lame hacks for apps that are built with old
// SDK tools. We must scan their APKs for renderscript bitcode and
// not launch them if it's present. Don't bother checking on devices
// that don't have 64 bit support.
boolean needsRenderScriptOverride = false;
- if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && abiOverride == null &&
+ if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && cpuAbiOverride == null &&
NativeLibraryHelper.hasRenderscriptBitcode(handle)) {
abiList = Build.SUPPORTED_32_BIT_ABIS;
needsRenderScriptOverride = true;
@@ -5558,8 +5578,8 @@
if (isAsec) {
copyRet = NativeLibraryHelper.findSupportedAbi(handle, abiList);
} else {
- copyRet = copyNativeLibrariesForInternalApp(handle, nativeLibraryRoot, abiList,
- useIsaSpecificSubdirs);
+ copyRet = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle,
+ nativeLibraryRoot, abiList, useIsaSpecificSubdirs);
}
if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES) {
@@ -5569,8 +5589,8 @@
if (copyRet >= 0) {
pkg.applicationInfo.primaryCpuAbi = abiList[copyRet];
- } else if (copyRet == PackageManager.NO_NATIVE_LIBRARIES && abiOverride != null) {
- pkg.applicationInfo.primaryCpuAbi = abiOverride;
+ } else if (copyRet == PackageManager.NO_NATIVE_LIBRARIES && cpuAbiOverride != null) {
+ pkg.applicationInfo.primaryCpuAbi = cpuAbiOverride;
} else if (needsRenderScriptOverride) {
pkg.applicationInfo.primaryCpuAbi = abiList[0];
}
@@ -5615,6 +5635,10 @@
pkgSetting.primaryCpuAbiString = pkg.applicationInfo.primaryCpuAbi;
pkgSetting.secondaryCpuAbiString = pkg.applicationInfo.secondaryCpuAbi;
+ pkgSetting.cpuAbiOverrideString = cpuAbiOverride;
+ // Copy the derived override back to the parsed package, so that we can
+ // update the package settings accordingly.
+ pkg.cpuAbiOverride = cpuAbiOverride;
Slog.d(TAG, "Resolved nativeLibraryRoot for " + pkg.applicationInfo.packageName
+ " to root=" + pkg.applicationInfo.nativeLibraryRootDir + ", isa="
@@ -6241,7 +6265,7 @@
}
}
- private static String calculateApkRoot(final String codePathString) {
+ private static String calculateBundledApkRoot(final String codePathString) {
final File codePath = new File(codePathString);
final File codeRoot;
if (FileUtils.contains(Environment.getRootDirectory(), codePath)) {
@@ -6281,14 +6305,9 @@
final ApplicationInfo info = pkg.applicationInfo;
final String codePath = pkg.codePath;
final File codeFile = new File(codePath);
- // If "/system/lib64/apkname" exists, assume that is the per-package
- // native library directory to use; otherwise use "/system/lib/apkname".
- final String apkRoot = calculateApkRoot(info.sourceDir);
-
final boolean bundledApp = isSystemApp(info) && !isUpdatedSystemApp(info);
final boolean asecApp = isForwardLocked(info) || isExternal(info);
-
info.nativeLibraryRootDir = null;
info.nativeLibraryRootRequiresIsa = false;
info.nativeLibraryDir = null;
@@ -6297,6 +6316,9 @@
if (isApkFile(codeFile)) {
// Monolithic install
if (bundledApp) {
+ // If "/system/lib64/apkname" exists, assume that is the per-package
+ // native library directory to use; otherwise use "/system/lib/apkname".
+ final String apkRoot = calculateBundledApkRoot(info.sourceDir);
final boolean is64Bit = VMRuntime.is64BitInstructionSet(
getPrimaryInstructionSet(info));
@@ -6352,7 +6374,7 @@
// If "/system/lib64/apkname" exists, assume that is the per-package
// native library directory to use; otherwise use "/system/lib/apkname".
- final String apkRoot = calculateApkRoot(pkg.applicationInfo.sourceDir);
+ final String apkRoot = calculateBundledApkRoot(pkg.applicationInfo.sourceDir);
setBundledAppAbi(pkg, apkRoot, apkName);
// pkgSetting might be null during rescan following uninstall of updates
// to a bundled app, so accommodate that possibility. The settings in
@@ -6440,58 +6462,6 @@
}
}
- private static void createNativeLibrarySubdir(File path) throws IOException {
- if (!path.isDirectory()) {
- path.delete();
-
- if (!path.mkdir()) {
- throw new IOException("Cannot create " + path.getPath());
- }
-
- try {
- Os.chmod(path.getPath(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
- } catch (ErrnoException e) {
- throw new IOException("Cannot chmod native library directory "
- + path.getPath(), e);
- }
- } else if (!SELinux.restorecon(path)) {
- throw new IOException("Cannot set SELinux context for " + path.getPath());
- }
- }
-
- private static int copyNativeLibrariesForInternalApp(NativeLibraryHelper.Handle handle,
- final File nativeLibraryRoot, String[] abiList, boolean useIsaSubdir) throws IOException {
- createNativeLibrarySubdir(nativeLibraryRoot);
-
- /*
- * If this is an internal application or our nativeLibraryPath points to
- * the app-lib directory, unpack the libraries if necessary.
- */
- int abi = NativeLibraryHelper.findSupportedAbi(handle, abiList);
- if (abi >= 0) {
- /*
- * If we have a matching instruction set, construct a subdir under the native
- * library root that corresponds to this instruction set.
- */
- final String instructionSet = VMRuntime.getInstructionSet(abiList[abi]);
- final File subDir;
- if (useIsaSubdir) {
- final File isaSubdir = new File(nativeLibraryRoot, instructionSet);
- createNativeLibrarySubdir(isaSubdir);
- subDir = isaSubdir;
- } else {
- subDir = nativeLibraryRoot;
- }
-
- int copyRet = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle, subDir, abiList[abi]);
- if (copyRet != PackageManager.INSTALL_SUCCEEDED) {
- return copyRet;
- }
- }
-
- return abi;
- }
-
private void killApplication(String pkgName, int appId, String reason) {
// Request the ActivityManager to kill the process(only for existing packages)
// so that we do not end up in a confused state while the user is still using the older
@@ -7812,19 +7782,19 @@
verificationParams.setInstallerUid(uid);
final Message msg = mHandler.obtainMessage(INIT_COPY);
- msg.obj = new InstallParams(originFile, false, observer, filteredFlags,
+ msg.obj = new InstallParams(originFile, null, false, observer, filteredFlags,
installerPackageName, verificationParams, user, packageAbiOverride);
mHandler.sendMessage(msg);
}
- void installStage(String packageName, File stageDir, IPackageInstallObserver2 observer,
- InstallSessionParams params, String installerPackageName, int installerUid,
- UserHandle user) {
+ void installStage(String packageName, File stagedDir, String stagedCid,
+ IPackageInstallObserver2 observer, PackageInstaller.SessionParams params,
+ String installerPackageName, int installerUid, UserHandle user) {
final VerificationParams verifParams = new VerificationParams(null, params.originatingUri,
params.referrerUri, installerUid, null);
final Message msg = mHandler.obtainMessage(INIT_COPY);
- msg.obj = new InstallParams(stageDir, true, observer, params.installFlags,
+ msg.obj = new InstallParams(stagedDir, stagedCid, true, observer, params.installFlags,
installerPackageName, verifParams, user, params.abiOverride);
mHandler.sendMessage(msg);
}
@@ -8524,10 +8494,12 @@
* file, or a cluster directory. This location may be untrusted.
*/
final File originFile;
+ final String originCid;
/**
- * Flag indicating that {@link #originFile} has already been staged,
- * meaning downstream users don't need to defensively copy the contents.
+ * Flag indicating that {@link #originFile} or {@link #originCid} has
+ * already been staged, meaning downstream users don't need to
+ * defensively copy the contents.
*/
boolean originStaged;
@@ -8540,11 +8512,12 @@
final String packageAbiOverride;
boolean multiArch;
- InstallParams(File originFile, boolean originStaged, IPackageInstallObserver2 observer,
- int flags, String installerPackageName, VerificationParams verificationParams,
- UserHandle user, String packageAbiOverride) {
+ InstallParams(File originFile, String originCid, boolean originStaged,
+ IPackageInstallObserver2 observer, int flags, String installerPackageName,
+ VerificationParams verificationParams, UserHandle user, String packageAbiOverride) {
super(user);
- this.originFile = Preconditions.checkNotNull(originFile);
+ this.originFile = originFile;
+ this.originCid = originCid;
this.originStaged = originStaged;
this.observer = observer;
this.flags = flags;
@@ -8555,9 +8528,8 @@
@Override
public String toString() {
- return "InstallParams{"
- + Integer.toHexString(System.identityHashCode(this))
- + " " + originFile + "}";
+ return "InstallParams{" + Integer.toHexString(System.identityHashCode(this))
+ + " file=" + originFile + " cid=" + originCid + "}";
}
public ManifestDigest getManifestDigest() {
@@ -8626,15 +8598,6 @@
return pkgLite.recommendedInstallLocation;
}
- private long getMemoryLowThreshold() {
- final DeviceStorageMonitorInternal
- dsm = LocalServices.getService(DeviceStorageMonitorInternal.class);
- if (dsm == null) {
- return 0L;
- }
- return dsm.getMemoryLowThreshold();
- }
-
/*
* Invoke remote method to get package information and install
* location values. Override install location based on default
@@ -8643,6 +8606,20 @@
*/
public void handleStartCopy() throws RemoteException {
int ret = PackageManager.INSTALL_SUCCEEDED;
+
+ // If we're already staged, we've firmly committed to an install location
+ if (originStaged) {
+ if (originFile != null) {
+ flags |= PackageManager.INSTALL_INTERNAL;
+ flags &= ~PackageManager.INSTALL_EXTERNAL;
+ } else if (originCid != null) {
+ flags |= PackageManager.INSTALL_EXTERNAL;
+ flags &= ~PackageManager.INSTALL_INTERNAL;
+ } else {
+ throw new IllegalStateException("Invalid stage location");
+ }
+ }
+
final boolean onSd = (flags & PackageManager.INSTALL_EXTERNAL) != 0;
final boolean onInt = (flags & PackageManager.INSTALL_INTERNAL) != 0;
PackageInfoLite pkgLite = null;
@@ -8652,14 +8629,9 @@
Slog.w(TAG, "Conflicting flags specified for installing on both internal and external");
ret = PackageManager.INSTALL_FAILED_INVALID_INSTALL_LOCATION;
} else {
- final long lowThreshold = getMemoryLowThreshold();
- if (lowThreshold == 0L) {
- Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed");
- }
-
// Remote call to find out default install location
final String originPath = originFile.getAbsolutePath();
- pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags, lowThreshold,
+ pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags,
packageAbiOverride);
// Keep track of whether this package is a multiArch package until
// we perform a full scan of it. We need to do this because we might
@@ -8671,14 +8643,21 @@
* If we have too little free space, try to free cache
* before giving up.
*/
- if (pkgLite.recommendedInstallLocation
+ if (!originStaged && pkgLite.recommendedInstallLocation
== PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE) {
- final long size = mContainerService.calculateInstalledSize(
+ // TODO: focus freeing disk space on the target device
+ final StorageManager storage = StorageManager.from(mContext);
+ final long lowThreshold = storage.getStorageLowBytes(
+ Environment.getDataDirectory());
+
+ final long sizeBytes = mContainerService.calculateInstalledSize(
originPath, isForwardLocked(), packageAbiOverride);
- if (mInstaller.freeCache(size + lowThreshold) >= 0) {
+
+ if (mInstaller.freeCache(sizeBytes + lowThreshold) >= 0) {
pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags,
- lowThreshold, packageAbiOverride);
+ packageAbiOverride);
}
+
/*
* The cache free must have deleted the file we
* downloaded to install.
@@ -9208,24 +9187,11 @@
}
boolean checkFreeStorage(IMediaContainerService imcs) throws RemoteException {
- final long lowThreshold;
+ final long sizeBytes = imcs.calculateInstalledSize(originFile.getAbsolutePath(),
+ isFwdLocked(), abiOverride);
- final DeviceStorageMonitorInternal
- dsm = LocalServices.getService(DeviceStorageMonitorInternal.class);
- if (dsm == null) {
- Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed");
- lowThreshold = 0L;
- } else {
- if (dsm.isMemoryLow()) {
- Log.w(TAG, "Memory is reported as being too low; aborting package install");
- return false;
- }
-
- lowThreshold = dsm.getMemoryLowThreshold();
- }
-
- return imcs.checkInternalFreeStorage(originFile.getAbsolutePath(), isFwdLocked(),
- lowThreshold);
+ final StorageManager storage = StorageManager.from(mContext);
+ return (sizeBytes <= storage.getStorageBytesUntilLow(Environment.getDataDirectory()));
}
int copyApk(IMediaContainerService imcs, boolean temp) throws RemoteException {
@@ -9237,7 +9203,7 @@
resourceFile = originFile;
} else {
try {
- final File tempDir = mInstallerService.allocateSessionDir();
+ final File tempDir = mInstallerService.allocateInternalStageDirLegacy();
codeFile = tempDir;
resourceFile = tempDir;
} catch (IOException e) {
@@ -9274,48 +9240,11 @@
NativeLibraryHelper.Handle handle = null;
try {
handle = NativeLibraryHelper.Handle.create(codeFile);
- if (multiArch) {
- // Warn if we've set an abiOverride for multi-lib packages..
- // By definition, we need to copy both 32 and 64 bit libraries for
- // such packages.
- if (abiOverride != null) {
- Slog.w(TAG, "Ignoring abiOverride for multi arch application.");
- }
-
- int copyRet = PackageManager.NO_NATIVE_LIBRARIES;
- if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {
- copyRet = copyNativeLibrariesForInternalApp(handle, libraryRoot,
- Build.SUPPORTED_32_BIT_ABIS, true /* use isa specific subdirs */);
- maybeThrowExceptionForMultiArchCopy("Failure copying 32 bit native libraries", copyRet);
- }
-
- if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {
- copyRet = copyNativeLibrariesForInternalApp(handle, libraryRoot,
- Build.SUPPORTED_64_BIT_ABIS, true /* use isa specific subdirs */);
- maybeThrowExceptionForMultiArchCopy("Failure copying 64 bit native libraries", copyRet);
- }
- } else {
- String[] abiList = (abiOverride != null) ?
- new String[] { abiOverride } : Build.SUPPORTED_ABIS;
-
- if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && abiOverride == null &&
- NativeLibraryHelper.hasRenderscriptBitcode(handle)) {
- abiList = Build.SUPPORTED_32_BIT_ABIS;
- }
-
- int copyRet = copyNativeLibrariesForInternalApp(handle, libraryRoot, abiList,
- true /* use isa specific subdirs */);
- if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES) {
- Slog.w(TAG, "Failure copying native libraries [errorCode=" + copyRet + "]");
- return copyRet;
- }
- }
+ ret = NativeLibraryHelper.copyNativeBinariesIfNeededLI(handle, libraryRoot,
+ abiOverride, multiArch);
} catch (IOException e) {
Slog.e(TAG, "Copying native libraries failed", e);
ret = PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
- } catch (PackageManagerException pme) {
- Slog.e(TAG, "Copying native libraries failed", pme);
- ret = pme.error;
} finally {
IoUtils.closeQuietly(handle);
}
@@ -9490,8 +9419,6 @@
* renaming logic.
*/
class AsecInstallArgs extends InstallArgs {
- // TODO: teach about handling cluster directories
-
static final String RES_FILE_NAME = "pkg.apk";
static final String PUBLIC_RES_FILE_NAME = "res.zip";
@@ -9514,12 +9441,17 @@
super(null, false, null, (isExternal ? INSTALL_EXTERNAL : 0)
| (isForwardLocked ? INSTALL_FORWARD_LOCK : 0), null, null, null,
instructionSets, null, isMultiArch);
+ // Hackily pretend we're still looking at a full code path
+ if (!fullCodePath.endsWith(RES_FILE_NAME)) {
+ fullCodePath = new File(fullCodePath, RES_FILE_NAME).getAbsolutePath();
+ }
+
// Extract cid from fullCodePath
int eidx = fullCodePath.lastIndexOf("/");
String subStr1 = fullCodePath.substring(0, eidx);
int sidx = subStr1.lastIndexOf("/");
cid = subStr1.substring(sidx+1, eidx);
- setCachePath(subStr1);
+ setMountPath(subStr1);
}
AsecInstallArgs(String cid, String[] instructionSets, boolean isForwardLocked,
@@ -9528,7 +9460,7 @@
| (isForwardLocked ? INSTALL_FORWARD_LOCK : 0), null, null, null,
instructionSets, null, isMultiArch);
this.cid = cid;
- setCachePath(PackageHelper.getSdDir(cid));
+ setMountPath(PackageHelper.getSdDir(cid));
}
/** New install from existing */
@@ -9541,12 +9473,22 @@
}
void createCopyFile() {
- cid = getTempContainerId();
+ cid = mInstallerService.allocateExternalStageCidLegacy();
}
boolean checkFreeStorage(IMediaContainerService imcs) throws RemoteException {
- return imcs.checkExternalFreeStorage(originFile.getAbsolutePath(), isFwdLocked(),
+ final long sizeBytes = imcs.calculateInstalledSize(packagePath, isFwdLocked(),
abiOverride);
+
+ final File target;
+ if (isExternal()) {
+ target = new UserEnvironment(UserHandle.USER_OWNER).getExternalStorageDirectory();
+ } else {
+ target = Environment.getDataDirectory();
+ }
+
+ final StorageManager storage = StorageManager.from(mContext);
+ return (sizeBytes <= storage.getStorageBytesUntilLow(target));
}
private final boolean isExternal() {
@@ -9554,6 +9496,7 @@
}
int copyApk(IMediaContainerService imcs, boolean temp) throws RemoteException {
+ // TODO: if already staged, we only need to extract native code
if (temp) {
createCopyFile();
} else {
@@ -9564,12 +9507,12 @@
PackageHelper.destroySdDir(cid);
}
- final String newCachePath = imcs.copyPackageToContainer(
+ final String newMountPath = imcs.copyPackageToContainer(
originFile.getAbsolutePath(), cid, getEncryptKey(), isExternal(),
- isFwdLocked(), abiOverride);
+ isFwdLocked(), deriveAbiOverride(abiOverride, null /* settings */));
- if (newCachePath != null) {
- setCachePath(newCachePath);
+ if (newMountPath != null) {
+ setMountPath(newMountPath);
return PackageManager.INSTALL_SUCCEEDED;
} else {
return PackageManager.INSTALL_FAILED_CONTAINER_ERROR;
@@ -9598,10 +9541,10 @@
} else {
boolean mounted = PackageHelper.isContainerMounted(cid);
if (!mounted) {
- String newCachePath = PackageHelper.mountSdDir(cid, getEncryptKey(),
+ String newMountPath = PackageHelper.mountSdDir(cid, getEncryptKey(),
Process.SYSTEM_UID);
- if (newCachePath != null) {
- setCachePath(newCachePath);
+ if (newMountPath != null) {
+ setMountPath(newMountPath);
} else {
return PackageManager.INSTALL_FAILED_CONTAINER_ERROR;
}
@@ -9612,7 +9555,7 @@
boolean doRename(int status, PackageParser.Package pkg, String oldCodePath) {
String newCacheId = getNextCodePath(oldCodePath, pkg.packageName, "/" + RES_FILE_NAME);
- String newCachePath = null;
+ String newMountPath = null;
if (PackageHelper.isContainerMounted(cid)) {
// Unmount the container
if (!PackageHelper.unMountSdDir(cid)) {
@@ -9637,46 +9580,59 @@
}
if (!PackageHelper.isContainerMounted(newCacheId)) {
Slog.w(TAG, "Mounting container " + newCacheId);
- newCachePath = PackageHelper.mountSdDir(newCacheId,
+ newMountPath = PackageHelper.mountSdDir(newCacheId,
getEncryptKey(), Process.SYSTEM_UID);
} else {
- newCachePath = PackageHelper.getSdDir(newCacheId);
+ newMountPath = PackageHelper.getSdDir(newCacheId);
}
- if (newCachePath == null) {
+ if (newMountPath == null) {
Slog.w(TAG, "Failed to get cache path for " + newCacheId);
return false;
}
Log.i(TAG, "Succesfully renamed " + cid +
" to " + newCacheId +
- " at new path: " + newCachePath);
+ " at new path: " + newMountPath);
cid = newCacheId;
- setCachePath(newCachePath);
- // TODO: extend to support split APKs
- pkg.codePath = getCodePath();
- pkg.baseCodePath = getCodePath();
- pkg.splitCodePaths = null;
+ final File beforeCodeFile = new File(packagePath);
+ setMountPath(newMountPath);
+ final File afterCodeFile = new File(packagePath);
- pkg.applicationInfo.setCodePath(getCodePath());
- pkg.applicationInfo.setBaseCodePath(getCodePath());
- pkg.applicationInfo.setSplitCodePaths(null);
- pkg.applicationInfo.setResourcePath(getResourcePath());
- pkg.applicationInfo.setBaseResourcePath(getResourcePath());
- pkg.applicationInfo.setSplitResourcePaths(null);
+ // Reflect the rename in scanned details
+ pkg.codePath = afterCodeFile.getAbsolutePath();
+ pkg.baseCodePath = FileUtils.rewriteAfterRename(beforeCodeFile, afterCodeFile,
+ pkg.baseCodePath);
+ pkg.splitCodePaths = FileUtils.rewriteAfterRename(beforeCodeFile, afterCodeFile,
+ pkg.splitCodePaths);
+
+ // Reflect the rename in app info
+ pkg.applicationInfo.setCodePath(pkg.codePath);
+ pkg.applicationInfo.setBaseCodePath(pkg.baseCodePath);
+ pkg.applicationInfo.setSplitCodePaths(pkg.splitCodePaths);
+ pkg.applicationInfo.setResourcePath(pkg.codePath);
+ pkg.applicationInfo.setBaseResourcePath(pkg.baseCodePath);
+ pkg.applicationInfo.setSplitResourcePaths(pkg.splitCodePaths);
return true;
}
- private void setCachePath(String newCachePath) {
- File cachePath = new File(newCachePath);
- legacyNativeLibraryDir = new File(cachePath, LIB_DIR_NAME).getPath();
- packagePath = new File(cachePath, RES_FILE_NAME).getPath();
+ private void setMountPath(String mountPath) {
+ final File mountFile = new File(mountPath);
- if (isFwdLocked()) {
- resourcePath = new File(cachePath, PUBLIC_RES_FILE_NAME).getPath();
+ final File monolithicFile = new File(mountFile, RES_FILE_NAME);
+ if (monolithicFile.exists()) {
+ packagePath = monolithicFile.getAbsolutePath();
+ if (isFwdLocked()) {
+ resourcePath = new File(mountFile, PUBLIC_RES_FILE_NAME).getAbsolutePath();
+ } else {
+ resourcePath = packagePath;
+ }
} else {
+ packagePath = mountFile.getAbsolutePath();
resourcePath = packagePath;
}
+
+ legacyNativeLibraryDir = new File(mountFile, LIB_DIR_NAME).getAbsolutePath();
}
int doPostInstall(int status, int uid) {
@@ -9715,23 +9671,43 @@
PackageHelper.destroySdDir(cid);
}
- void cleanUpResourcesLI() {
- String sourceFile = getCodePath();
- // Remove dex file
- if (instructionSets == null) {
- throw new IllegalStateException("instructionSet == null");
- }
- String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);
- for (String dexCodeInstructionSet : dexCodeInstructionSets) {
- int retCode = mInstaller.rmdex(sourceFile, dexCodeInstructionSet);
- if (retCode < 0) {
- Slog.w(TAG, "Couldn't remove dex file for package: "
- + " at location "
- + sourceFile.toString() + ", retcode=" + retCode);
- // we don't consider this to be a failure of the core package deletion
+ private List<String> getAllCodePaths() {
+ final File codeFile = new File(getCodePath());
+ if (codeFile != null && codeFile.exists()) {
+ try {
+ final PackageLite pkg = PackageParser.parsePackageLite(codeFile, 0);
+ return pkg.getAllCodePaths();
+ } catch (PackageParserException e) {
+ // Ignored; we tried our best
}
}
+ return Collections.EMPTY_LIST;
+ }
+
+ void cleanUpResourcesLI() {
+ // Enumerate all code paths before deleting
+ cleanUpResourcesLI(getAllCodePaths());
+ }
+
+ private void cleanUpResourcesLI(List<String> allCodePaths) {
cleanUp();
+
+ if (!allCodePaths.isEmpty()) {
+ if (instructionSets == null) {
+ throw new IllegalStateException("instructionSet == null");
+ }
+ String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);
+ for (String codePath : allCodePaths) {
+ for (String dexCodeInstructionSet : dexCodeInstructionSets) {
+ int retCode = mInstaller.rmdex(codePath, dexCodeInstructionSet);
+ if (retCode < 0) {
+ Slog.w(TAG, "Couldn't remove dex file for package: "
+ + " at location " + codePath + ", retcode=" + retCode);
+ // we don't consider this to be a failure of the core package deletion
+ }
+ }
+ }
+ }
}
boolean matchContainer(String app) {
@@ -9746,16 +9722,19 @@
}
boolean doPostDeleteLI(boolean delete) {
- boolean ret = false;
+ if (DEBUG_SD_INSTALL) Slog.i(TAG, "doPostDeleteLI() del=" + delete);
+ final List<String> allCodePaths = getAllCodePaths();
boolean mounted = PackageHelper.isContainerMounted(cid);
if (mounted) {
// Unmount first
- ret = PackageHelper.unMountSdDir(cid);
+ if (PackageHelper.unMountSdDir(cid)) {
+ mounted = false;
+ }
}
- if (ret && delete) {
- cleanUpResourcesLI();
+ if (!mounted && delete) {
+ cleanUpResourcesLI(allCodePaths);
}
- return ret;
+ return !mounted;
}
@Override
@@ -9917,7 +9896,7 @@
*/
private void installNewPackageLI(PackageParser.Package pkg,
int parseFlags, int scanMode, UserHandle user,
- String installerPackageName, PackageInstalledInfo res, String abiOverride) {
+ String installerPackageName, PackageInstalledInfo res) {
// Remember this for later, in case we need to rollback this install
String pkgName = pkg.packageName;
@@ -9944,7 +9923,7 @@
try {
PackageParser.Package newPackage = scanPackageLI(pkg, parseFlags, scanMode,
- System.currentTimeMillis(), user, abiOverride);
+ System.currentTimeMillis(), user);
updateSettingsLI(newPackage, installerPackageName, null, null, res);
// delete the partially installed application. the data directory will have to be
@@ -9980,7 +9959,7 @@
private void replacePackageLI(PackageParser.Package pkg,
int parseFlags, int scanMode, UserHandle user,
- String installerPackageName, PackageInstalledInfo res, String abiOverride) {
+ String installerPackageName, PackageInstalledInfo res) {
PackageParser.Package oldPackage;
String pkgName = pkg.packageName;
int[] allUsers;
@@ -10019,19 +9998,17 @@
boolean sysPkg = (isSystemApp(oldPackage));
if (sysPkg) {
replaceSystemPackageLI(oldPackage, pkg, parseFlags, scanMode,
- user, allUsers, perUserInstalled, installerPackageName, res,
- abiOverride);
+ user, allUsers, perUserInstalled, installerPackageName, res);
} else {
replaceNonSystemPackageLI(oldPackage, pkg, parseFlags, scanMode,
- user, allUsers, perUserInstalled, installerPackageName, res,
- abiOverride);
+ user, allUsers, perUserInstalled, installerPackageName, res);
}
}
private void replaceNonSystemPackageLI(PackageParser.Package deletedPackage,
PackageParser.Package pkg, int parseFlags, int scanMode, UserHandle user,
int[] allUsers, boolean[] perUserInstalled,
- String installerPackageName, PackageInstalledInfo res, String abiOverride) {
+ String installerPackageName, PackageInstalledInfo res) {
String pkgName = deletedPackage.packageName;
boolean deletedPkg = true;
boolean updatedSettings = false;
@@ -10056,7 +10033,7 @@
deleteCodeCacheDirsLI(pkgName);
try {
final PackageParser.Package newPackage = scanPackageLI(pkg, parseFlags,
- scanMode | SCAN_UPDATE_TIME, System.currentTimeMillis(), user, abiOverride);
+ scanMode | SCAN_UPDATE_TIME, System.currentTimeMillis(), user);
updateSettingsLI(newPackage, installerPackageName, allUsers, perUserInstalled, res);
updatedSettings = true;
} catch (PackageManagerException e) {
@@ -10089,8 +10066,7 @@
int oldScanMode = (oldOnSd ? 0 : SCAN_MONITOR) | SCAN_UPDATE_SIGNATURE
| SCAN_UPDATE_TIME;
try {
- scanPackageLI(restoreFile, oldParseFlags, oldScanMode, origUpdateTime, null,
- null);
+ scanPackageLI(restoreFile, oldParseFlags, oldScanMode, origUpdateTime, null);
} catch (PackageManagerException e) {
Slog.e(TAG, "Failed to restore package : " + pkgName + " after failed upgrade: "
+ e.getMessage());
@@ -10112,7 +10088,7 @@
private void replaceSystemPackageLI(PackageParser.Package deletedPackage,
PackageParser.Package pkg, int parseFlags, int scanMode, UserHandle user,
int[] allUsers, boolean[] perUserInstalled,
- String installerPackageName, PackageInstalledInfo res, String abiOverride) {
+ String installerPackageName, PackageInstalledInfo res) {
if (DEBUG_INSTALL) Slog.d(TAG, "replaceSystemPackageLI: new=" + pkg
+ ", old=" + deletedPackage);
boolean updatedSettings = false;
@@ -10172,7 +10148,7 @@
PackageParser.Package newPackage = null;
try {
- newPackage = scanPackageLI(pkg, parseFlags, scanMode, 0, user, abiOverride);
+ newPackage = scanPackageLI(pkg, parseFlags, scanMode, 0, user);
if (newPackage.mExtras != null) {
final PackageSetting newPkgSetting = (PackageSetting) newPackage.mExtras;
newPkgSetting.firstInstallTime = oldPkgSetting.firstInstallTime;
@@ -10204,8 +10180,7 @@
}
// Add back the old system package
try {
- scanPackageLI(oldPkg, parseFlags, SCAN_MONITOR | SCAN_UPDATE_SIGNATURE, 0, user,
- null);
+ scanPackageLI(oldPkg, parseFlags, SCAN_MONITOR | SCAN_UPDATE_SIGNATURE, 0, user);
} catch (PackageManagerException e) {
Slog.e(TAG, "Failed to restore original package: " + e.getMessage());
}
@@ -10336,6 +10311,9 @@
return;
}
+ // Mark that we have an install time CPU ABI override.
+ pkg.cpuAbiOverride = args.abiOverride;
+
String pkgName = res.name = pkg.packageName;
if ((pkg.applicationInfo.flags&ApplicationInfo.FLAG_TEST_ONLY) != 0) {
if ((pFlags&PackageManager.INSTALL_ALLOW_TEST) == 0) {
@@ -10454,10 +10432,10 @@
if (replace) {
replacePackageLI(pkg, parseFlags, scanMode, args.user,
- installerPackageName, res, args.abiOverride);
+ installerPackageName, res);
} else {
installNewPackageLI(pkg, parseFlags, scanMode | SCAN_DELETE_DATA_ON_FAILURES, args.user,
- installerPackageName, res, args.abiOverride);
+ installerPackageName, res);
}
synchronized (mPackages) {
final PackageSetting ps = mSettings.mPackages.get(pkgName);
@@ -10893,8 +10871,7 @@
final PackageParser.Package newPkg;
try {
- newPkg = scanPackageLI(disabledPs.codePath, parseFlags, SCAN_MONITOR | SCAN_NO_PATHS, 0,
- null, null);
+ newPkg = scanPackageLI(disabledPs.codePath, parseFlags, SCAN_MONITOR | SCAN_NO_PATHS, 0, null);
} catch (PackageManagerException e) {
Slog.w(TAG, "Failed to restore system package:" + newPs.name + ": " + e.getMessage());
return false;
@@ -10944,6 +10921,7 @@
outInfo.args = createInstallArgsForExisting(packageFlagsToInstallFlags(ps),
ps.codePathString, ps.resourcePathString, ps.legacyNativeLibraryPathString,
getAppDexInstructionSets(ps), isMultiArch(ps));
+ if (DEBUG_SD_INSTALL) Slog.i(TAG, "args=" + outInfo.args);
}
return true;
}
@@ -11446,11 +11424,13 @@
@Override
public void addPreferredActivity(IntentFilter filter, int match,
ComponentName[] set, ComponentName activity, int userId) {
- addPreferredActivityInternal(filter, match, set, activity, true, userId);
+ addPreferredActivityInternal(filter, match, set, activity, true, userId,
+ "Adding preferred");
}
private void addPreferredActivityInternal(IntentFilter filter, int match,
- ComponentName[] set, ComponentName activity, boolean always, int userId) {
+ ComponentName[] set, ComponentName activity, boolean always, int userId,
+ String opname) {
// writer
int callingUid = Binder.getCallingUid();
enforceCrossUserPermission(callingUid, userId, true, "add preferred activity");
@@ -11472,10 +11452,11 @@
android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
}
- Slog.i(TAG, "Adding preferred activity " + activity + " for user " + userId + " :");
+ PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);
+ Slog.i(TAG, opname + " activity " + activity.flattenToShortString() + " for user "
+ + userId + ":");
filter.dump(new LogPrinter(Log.INFO, TAG), " ");
- mSettings.editPreferredActivitiesLPw(userId).addFilter(
- new PreferredActivity(filter, match, set, activity, always));
+ pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
mSettings.writePackageRestrictionsLPr(userId);
}
}
@@ -11498,7 +11479,6 @@
final int callingUid = Binder.getCallingUid();
enforceCrossUserPermission(callingUid, userId, true, "replace preferred activity");
- final int callingUserId = UserHandle.getUserId(callingUid);
synchronized (mPackages) {
if (mContext.checkCallingOrSelfPermission(
android.Manifest.permission.SET_PREFERRED_APPLICATIONS)
@@ -11513,30 +11493,63 @@
android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
}
- PreferredIntentResolver pir = mSettings.mPreferredActivities.get(callingUserId);
+ PreferredIntentResolver pir = mSettings.mPreferredActivities.get(userId);
if (pir != null) {
- Intent intent = new Intent(filter.getAction(0)).addCategory(filter.getCategory(0));
- if (filter.countDataSchemes() == 1) {
- Uri.Builder builder = new Uri.Builder();
- builder.scheme(filter.getDataScheme(0));
- intent.setData(builder.build());
- }
- List<PreferredActivity> matches = pir.queryIntent(
- intent, null, true, callingUserId);
- if (DEBUG_PREFERRED) {
- Slog.i(TAG, matches.size() + " preferred matches for " + intent);
- }
- for (int i = 0; i < matches.size(); i++) {
- PreferredActivity pa = matches.get(i);
+ // Get all of the existing entries that exactly match this filter.
+ ArrayList<PreferredActivity> existing = pir.findFilters(filter);
+ if (existing != null && existing.size() == 1) {
+ PreferredActivity cur = existing.get(0);
if (DEBUG_PREFERRED) {
- Slog.i(TAG, "Removing preferred activity "
- + pa.mPref.mComponent + ":");
+ Slog.i(TAG, "Checking replace of preferred:");
+ filter.dump(new LogPrinter(Log.INFO, TAG), " ");
+ if (!cur.mPref.mAlways) {
+ Slog.i(TAG, " -- CUR; not mAlways!");
+ } else {
+ Slog.i(TAG, " -- CUR: mMatch=" + cur.mPref.mMatch);
+ Slog.i(TAG, " -- CUR: mSet="
+ + Arrays.toString(cur.mPref.mSetComponents));
+ Slog.i(TAG, " -- CUR: mComponent=" + cur.mPref.mShortComponent);
+ Slog.i(TAG, " -- NEW: mMatch="
+ + (match&IntentFilter.MATCH_CATEGORY_MASK));
+ Slog.i(TAG, " -- CUR: mSet=" + Arrays.toString(set));
+ Slog.i(TAG, " -- CUR: mComponent=" + activity.flattenToShortString());
+ }
+ }
+ if (cur.mPref.mAlways && cur.mPref.mComponent.equals(activity)
+ && cur.mPref.mMatch == (match&IntentFilter.MATCH_CATEGORY_MASK)
+ && cur.mPref.sameSet(set)) {
+ if (DEBUG_PREFERRED) {
+ Slog.i(TAG, "Replacing with same preferred activity "
+ + cur.mPref.mShortComponent + " for user "
+ + userId + ":");
+ filter.dump(new LogPrinter(Log.INFO, TAG), " ");
+ } else {
+ Slog.i(TAG, "Replacing with same preferred activity "
+ + cur.mPref.mShortComponent + " for user "
+ + userId);
+ }
+ return;
+ }
+ }
+
+ if (existing != null) {
+ if (DEBUG_PREFERRED) {
+ Slog.i(TAG, existing.size() + " existing preferred matches for:");
filter.dump(new LogPrinter(Log.INFO, TAG), " ");
}
- pir.removeFilter(pa);
+ for (int i = 0; i < existing.size(); i++) {
+ PreferredActivity pa = existing.get(i);
+ if (DEBUG_PREFERRED) {
+ Slog.i(TAG, "Removing existing preferred activity "
+ + pa.mPref.mComponent + ":");
+ pa.dump(new LogPrinter(Log.INFO, TAG), " ");
+ }
+ pir.removeFilter(pa);
+ }
}
}
- addPreferredActivityInternal(filter, match, set, activity, true, callingUserId);
+ addPreferredActivityInternal(filter, match, set, activity, true, userId,
+ "Replacing preferred");
}
}
@@ -12594,7 +12607,7 @@
private boolean mMediaMounted = false;
- private String getEncryptKey() {
+ static String getEncryptKey() {
try {
String sdEncKey = SystemKeyStore.getInstance().retrieveKeyHexString(
SD_ENCRYPTION_KEYSTORE_NAME);
@@ -12614,30 +12627,6 @@
Slog.e(TAG, "Failed to retrieve encryption keys with exception: " + ioe);
return null;
}
-
- }
-
- /* package */static String getTempContainerId() {
- int tmpIdx = 1;
- String list[] = PackageHelper.getSecureContainerList();
- if (list != null) {
- for (final String name : list) {
- // Ignore null and non-temporary container entries
- if (name == null || !name.startsWith(mTempContainerPrefix)) {
- continue;
- }
-
- String subStr = name.substring(mTempContainerPrefix.length());
- try {
- int cid = Integer.parseInt(subStr);
- if (cid >= tmpIdx) {
- tmpIdx = cid + 1;
- }
- } catch (NumberFormatException e) {
- }
- }
- }
- return mTempContainerPrefix + tmpIdx;
}
/*
@@ -12695,31 +12684,27 @@
*/
private void updateExternalMediaStatusInner(boolean isMounted, boolean reportStatus,
boolean externalStorage) {
- // Collection of uids
- int uidArr[] = null;
- // Collection of stale containers
- HashSet<String> removeCids = new HashSet<String>();
- // Collection of packages on external media with valid containers.
- HashMap<AsecInstallArgs, String> processCids = new HashMap<AsecInstallArgs, String>();
- // Get list of secure containers.
- final String list[] = PackageHelper.getSecureContainerList();
- if (list == null || list.length == 0) {
- Log.i(TAG, "No secure containers on sdcard");
+ ArrayMap<AsecInstallArgs, String> processCids = new ArrayMap<>();
+ int[] uidArr = EmptyArray.INT;
+
+ final String[] list = PackageHelper.getSecureContainerList();
+ if (ArrayUtils.isEmpty(list)) {
+ Log.i(TAG, "No secure containers found");
} else {
// Process list of secure containers and categorize them
// as active or stale based on their package internal state.
- int uidList[] = new int[list.length];
- int num = 0;
+
// reader
synchronized (mPackages) {
for (String cid : list) {
+ // Leave stages untouched for now; installer service owns them
+ if (PackageInstallerService.isStageName(cid)) continue;
+
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Processing container " + cid);
String pkgName = getAsecPackageName(cid);
if (pkgName == null) {
- if (DEBUG_SD_INSTALL)
- Log.i(TAG, "Container : " + cid + " stale");
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + " with no package name");
continue;
}
if (DEBUG_SD_INSTALL)
@@ -12727,8 +12712,7 @@
final PackageSetting ps = mSettings.mPackages.get(pkgName);
if (ps == null) {
- Log.i(TAG, "Deleting container with no matching settings " + cid);
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + " with no matching settings");
continue;
}
@@ -12744,7 +12728,8 @@
getAppDexInstructionSets(ps), isForwardLocked(ps), isMultiArch(ps));
// The package status is changed only if the code path
// matches between settings and the container id.
- if (ps.codePathString != null && ps.codePathString.equals(args.getCodePath())) {
+ if (ps.codePathString != null
+ && ps.codePathString.startsWith(args.getCodePath())) {
if (DEBUG_SD_INSTALL) {
Log.i(TAG, "Container : " + cid + " corresponds to pkg : " + pkgName
+ " at code path: " + ps.codePathString);
@@ -12754,35 +12739,25 @@
processCids.put(args, ps.codePathString);
final int uid = ps.appId;
if (uid != -1) {
- uidList[num++] = uid;
+ uidArr = ArrayUtils.appendInt(uidArr, uid);
}
} else {
- Log.i(TAG, "Deleting stale container for " + cid);
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + ": expected codePath="
+ + ps.codePathString);
}
}
}
- if (num > 0) {
- // Sort uid list
- Arrays.sort(uidList, 0, num);
- // Throw away duplicates
- uidArr = new int[num];
- uidArr[0] = uidList[0];
- int di = 0;
- for (int i = 1; i < num; i++) {
- if (uidList[i - 1] != uidList[i]) {
- uidArr[di++] = uidList[i];
- }
- }
- }
+ Arrays.sort(uidArr);
}
+
// Process packages with valid entries.
if (isMounted) {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Loading packages");
- loadMediaPackages(processCids, uidArr, removeCids);
+ loadMediaPackages(processCids, uidArr);
startCleaningPackages();
+ mInstallerService.onSecureContainersAvailable();
} else {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Unloading packages");
@@ -12790,8 +12765,8 @@
}
}
- private void sendResourcesChangedBroadcast(boolean mediaStatus, boolean replacing,
- ArrayList<String> pkgList, int uidArr[], IIntentReceiver finishedReceiver) {
+ private void sendResourcesChangedBroadcast(boolean mediaStatus, boolean replacing,
+ ArrayList<String> pkgList, int uidArr[], IIntentReceiver finishedReceiver) {
int size = pkgList.size();
if (size > 0) {
// Send broadcasts here
@@ -12816,11 +12791,10 @@
* the cid is added to list of removeCids. We currently don't delete stale
* containers.
*/
- private void loadMediaPackages(HashMap<AsecInstallArgs, String> processCids, int uidArr[],
- HashSet<String> removeCids) {
+ private void loadMediaPackages(ArrayMap<AsecInstallArgs, String> processCids, int[] uidArr) {
ArrayList<String> pkgList = new ArrayList<String>();
Set<AsecInstallArgs> keys = processCids.keySet();
- boolean doGc = false;
+
for (AsecInstallArgs args : keys) {
String codePath = processCids.get(args);
if (DEBUG_SD_INSTALL)
@@ -12834,7 +12808,7 @@
continue;
}
// Check code path here.
- if (codePath == null || !codePath.equals(args.getCodePath())) {
+ if (codePath == null || !codePath.startsWith(args.getCodePath())) {
Slog.e(TAG, "Container " + args.cid + " cachepath " + args.getCodePath()
+ " does not match one in settings " + codePath);
continue;
@@ -12848,11 +12822,10 @@
parseFlags |= PackageParser.PARSE_FORWARD_LOCK;
}
- doGc = true;
synchronized (mInstallLock) {
PackageParser.Package pkg = null;
try {
- pkg = scanPackageLI(new File(codePath), parseFlags, 0, 0, null, null);
+ pkg = scanPackageLI(new File(codePath), parseFlags, 0, 0, null);
} catch (PackageManagerException e) {
Slog.w(TAG, "Failed to scan " + codePath + ": " + e.getMessage());
}
@@ -12878,9 +12851,7 @@
} finally {
if (retCode != PackageManager.INSTALL_SUCCEEDED) {
- // Don't destroy container here. Wait till gc clears things
- // up.
- removeCids.add(args.cid);
+ Log.w(TAG, "Container " + args.cid + " is stale, retCode=" + retCode);
}
}
}
@@ -12915,21 +12886,6 @@
if (pkgList.size() > 0) {
sendResourcesChangedBroadcast(true, false, pkgList, uidArr, null);
}
- // Force gc to avoid any stale parser references that we might have.
- if (doGc) {
- Runtime.getRuntime().gc();
- }
- // List stale containers and destroy stale temporary containers.
- if (removeCids != null) {
- for (String cid : removeCids) {
- if (cid.startsWith(mTempContainerPrefix)) {
- Log.i(TAG, "Destroying stale temporary container " + cid);
- PackageHelper.destroySdDir(cid);
- } else {
- Log.w(TAG, "Container " + cid + " is stale");
- }
- }
- }
}
/*
@@ -12953,7 +12909,7 @@
* that we always have to post this message if status has been requested no
* matter what.
*/
- private void unloadMediaPackages(HashMap<AsecInstallArgs, String> processCids, int uidArr[],
+ private void unloadMediaPackages(ArrayMap<AsecInstallArgs, String> processCids, int uidArr[],
final boolean reportStatus) {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "unloading media packages");
diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java
index a6571cf..696aa34 100644
--- a/services/core/java/com/android/server/pm/PackageSetting.java
+++ b/services/core/java/com/android/server/pm/PackageSetting.java
@@ -31,9 +31,11 @@
PackageSetting(String name, String realName, File codePath, File resourcePath,
String legacyNativeLibraryPathString, String primaryCpuAbiString,
- String secondaryCpuAbiString, int pVersionCode, int pkgFlags) {
+ String secondaryCpuAbiString, String cpuAbiOverrideString,
+ int pVersionCode, int pkgFlags) {
super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,
- primaryCpuAbiString, secondaryCpuAbiString, pVersionCode, pkgFlags);
+ primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,
+ pVersionCode, pkgFlags);
}
/**
diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java
index e29332c..bf13fd9 100644
--- a/services/core/java/com/android/server/pm/PackageSettingBase.java
+++ b/services/core/java/com/android/server/pm/PackageSettingBase.java
@@ -64,8 +64,25 @@
@Deprecated
String legacyNativeLibraryPathString;
+ /**
+ * The primary CPU abi for this package. This value is regenerated at every
+ * boot scan.
+ */
String primaryCpuAbiString;
+
+ /**
+ * The secondary CPU abi for this package. This value is regenerated at every
+ * boot scan.
+ */
String secondaryCpuAbiString;
+
+ /**
+ * The install time CPU override, if any. This value is written at install time
+ * and doesn't change during the life of an install. If non-null,
+ * {@code primaryCpuAbiString} will contain the same value.
+ */
+ String cpuAbiOverrideString;
+
long timeStamp;
long firstInstallTime;
long lastUpdateTime;
@@ -94,12 +111,13 @@
String installerPackageName;
PackageSettingBase(String name, String realName, File codePath, File resourcePath,
String legacyNativeLibraryPathString, String primaryCpuAbiString,
- String secondaryCpuAbiString, int pVersionCode, int pkgFlags) {
+ String secondaryCpuAbiString, String cpuAbiOverrideString,
+ int pVersionCode, int pkgFlags) {
super(pkgFlags);
this.name = name;
this.realName = realName;
init(codePath, resourcePath, legacyNativeLibraryPathString, primaryCpuAbiString,
- secondaryCpuAbiString, pVersionCode);
+ secondaryCpuAbiString, cpuAbiOverrideString, pVersionCode);
}
/**
@@ -118,6 +136,7 @@
legacyNativeLibraryPathString = base.legacyNativeLibraryPathString;
primaryCpuAbiString = base.primaryCpuAbiString;
secondaryCpuAbiString = base.secondaryCpuAbiString;
+ cpuAbiOverrideString = base.cpuAbiOverrideString;
timeStamp = base.timeStamp;
firstInstallTime = base.firstInstallTime;
lastUpdateTime = base.lastUpdateTime;
@@ -145,7 +164,8 @@
}
void init(File codePath, File resourcePath, String legacyNativeLibraryPathString,
- String primaryCpuAbiString, String secondaryCpuAbiString, int pVersionCode) {
+ String primaryCpuAbiString, String secondaryCpuAbiString,
+ String cpuAbiOverrideString, int pVersionCode) {
this.codePath = codePath;
this.codePathString = codePath.toString();
this.resourcePath = resourcePath;
@@ -153,6 +173,7 @@
this.legacyNativeLibraryPathString = legacyNativeLibraryPathString;
this.primaryCpuAbiString = primaryCpuAbiString;
this.secondaryCpuAbiString = secondaryCpuAbiString;
+ this.cpuAbiOverrideString = cpuAbiOverrideString;
this.versionCode = pVersionCode;
}
@@ -185,6 +206,7 @@
primaryCpuAbiString = base.primaryCpuAbiString;
secondaryCpuAbiString = base.secondaryCpuAbiString;
+ cpuAbiOverrideString = base.cpuAbiOverrideString;
timeStamp = base.timeStamp;
firstInstallTime = base.firstInstallTime;
lastUpdateTime = base.lastUpdateTime;
diff --git a/services/core/java/com/android/server/pm/PendingPackage.java b/services/core/java/com/android/server/pm/PendingPackage.java
index 85be651..5d30e76 100644
--- a/services/core/java/com/android/server/pm/PendingPackage.java
+++ b/services/core/java/com/android/server/pm/PendingPackage.java
@@ -22,10 +22,12 @@
final int sharedId;
PendingPackage(String name, String realName, File codePath, File resourcePath,
- String nativeLibrary32PathString, String nativeLibrary64PathString,
- String requiredCpuAbiString, int sharedId, int pVersionCode, int pkgFlags) {
- super(name, realName, codePath, resourcePath, nativeLibrary32PathString, nativeLibrary64PathString,
- requiredCpuAbiString, pVersionCode, pkgFlags);
+ String legacyNativeLibraryPathString, String primaryCpuAbiString,
+ String secondaryCpuAbiString, String cpuAbiOverrideString, int sharedId,
+ int pVersionCode, int pkgFlags) {
+ super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,
+ primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,
+ pVersionCode, pkgFlags);
this.sharedId = sharedId;
}
}
diff --git a/services/core/java/com/android/server/pm/PreferredComponent.java b/services/core/java/com/android/server/pm/PreferredComponent.java
index f437372..69c1909 100644
--- a/services/core/java/com/android/server/pm/PreferredComponent.java
+++ b/services/core/java/com/android/server/pm/PreferredComponent.java
@@ -44,10 +44,10 @@
// Whether this is to be the one that's always chosen. If false, it's the most recently chosen.
public boolean mAlways;
- private final String[] mSetPackages;
- private final String[] mSetClasses;
- private final String[] mSetComponents;
- private final String mShortComponent;
+ final String[] mSetPackages;
+ final String[] mSetClasses;
+ final String[] mSetComponents;
+ final String mShortComponent;
private String mParseError;
private final Callbacks mCallbacks;
@@ -193,7 +193,12 @@
}
public boolean sameSet(List<ResolveInfo> query, int priority) {
- if (mSetPackages == null) return false;
+ if (mSetPackages == null) {
+ return query == null;
+ }
+ if (query == null) {
+ return false;
+ }
final int NQ = query.size();
final int NS = mSetPackages.length;
int numMatch = 0;
@@ -215,6 +220,27 @@
return numMatch == NS;
}
+ public boolean sameSet(ComponentName[] comps) {
+ if (mSetPackages == null) return false;
+ final int NQ = comps.length;
+ final int NS = mSetPackages.length;
+ int numMatch = 0;
+ for (int i=0; i<NQ; i++) {
+ ComponentName cn = comps[i];
+ boolean good = false;
+ for (int j=0; j<NS; j++) {
+ if (mSetPackages[j].equals(cn.getPackageName())
+ && mSetClasses[j].equals(cn.getClassName())) {
+ numMatch++;
+ good = true;
+ break;
+ }
+ }
+ if (!good) return false;
+ }
+ return numMatch == NS;
+ }
+
public void dump(PrintWriter out, String prefix, Object ident) {
out.print(prefix); out.print(
Integer.toHexString(System.identityHashCode(ident)));
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index cd2aa22..c346f71 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -325,8 +325,8 @@
PackageSetting getPackageLPw(PackageParser.Package pkg, PackageSetting origPackage,
String realName, SharedUserSetting sharedUser, File codePath, File resourcePath,
- String legacyNativeLibraryPathString, String primaryCpuAbi, String secondaryCpuAbi, int pkgFlags,
- UserHandle user, boolean add) {
+ String legacyNativeLibraryPathString, String primaryCpuAbi, String secondaryCpuAbi,
+ int pkgFlags, UserHandle user, boolean add) {
final String name = pkg.packageName;
PackageSetting p = getPackageLPw(name, origPackage, realName, sharedUser, codePath,
resourcePath, legacyNativeLibraryPathString, primaryCpuAbi, secondaryCpuAbi,
@@ -417,7 +417,8 @@
}
PackageSetting ret = addPackageLPw(name, p.realName, p.codePath, p.resourcePath,
p.legacyNativeLibraryPathString, p.primaryCpuAbiString,
- p.secondaryCpuAbiString, p.appId, p.versionCode, p.pkgFlags);
+ p.secondaryCpuAbiString, p.secondaryCpuAbiString,
+ p.appId, p.versionCode, p.pkgFlags);
mDisabledSysPackages.remove(name);
return ret;
}
@@ -432,7 +433,7 @@
PackageSetting addPackageLPw(String name, String realName, File codePath, File resourcePath,
String legacyNativeLibraryPathString, String primaryCpuAbiString, String secondaryCpuAbiString,
- int uid, int vc, int pkgFlags) {
+ String cpuAbiOverrideString, int uid, int vc, int pkgFlags) {
PackageSetting p = mPackages.get(name);
if (p != null) {
if (p.appId == uid) {
@@ -443,7 +444,8 @@
return null;
}
p = new PackageSetting(name, realName, codePath, resourcePath,
- legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString, vc, pkgFlags);
+ legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString,
+ cpuAbiOverrideString, vc, pkgFlags);
p.appId = uid;
if (addUserIdLPw(uid, p, name)) {
mPackages.put(name, p);
@@ -512,11 +514,13 @@
private PackageSetting getPackageLPw(String name, PackageSetting origPackage,
String realName, SharedUserSetting sharedUser, File codePath, File resourcePath,
String legacyNativeLibraryPathString, String primaryCpuAbiString, String secondaryCpuAbiString,
- int vc, int pkgFlags, UserHandle installUser, boolean add, boolean allowInstall) {
+ int vc, int pkgFlags, UserHandle installUser, boolean add,
+ boolean allowInstall) {
PackageSetting p = mPackages.get(name);
if (p != null) {
p.primaryCpuAbiString = primaryCpuAbiString;
p.secondaryCpuAbiString = secondaryCpuAbiString;
+
if (!p.codePath.equals(codePath)) {
// Check to see if its a disabled system app
if ((p.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) {
@@ -560,7 +564,8 @@
if (origPackage != null) {
// We are consuming the data from an existing package.
p = new PackageSetting(origPackage.name, name, codePath, resourcePath,
- legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString, vc, pkgFlags);
+ legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString,
+ null /* cpuAbiOverrideString */, vc, pkgFlags);
if (PackageManagerService.DEBUG_UPGRADE) Log.v(PackageManagerService.TAG, "Package "
+ name + " is adopting original package " + origPackage.name);
// Note that we will retain the new package's signature so
@@ -577,7 +582,8 @@
p.setTimeStamp(codePath.lastModified());
} else {
p = new PackageSetting(name, realName, codePath, resourcePath,
- legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString, vc, pkgFlags);
+ legacyNativeLibraryPathString, primaryCpuAbiString, secondaryCpuAbiString,
+ null /* cpuAbiOverrideString */, vc, pkgFlags);
p.setTimeStamp(codePath.lastModified());
p.sharedUser = sharedUser;
// If this is not a system app, it starts out stopped.
@@ -720,6 +726,7 @@
// Update the required Cpu Abi
p.primaryCpuAbiString = pkg.applicationInfo.primaryCpuAbi;
p.secondaryCpuAbiString = pkg.applicationInfo.secondaryCpuAbi;
+ p.cpuAbiOverrideString = pkg.cpuAbiOverride;
// Update version code if needed
if (pkg.mVersionCode != p.versionCode) {
p.versionCode = pkg.mVersionCode;
@@ -1888,6 +1895,9 @@
if (pkg.secondaryCpuAbiString != null) {
serializer.attribute(null, "secondaryCpuAbi", pkg.secondaryCpuAbiString);
}
+ if (pkg.cpuAbiOverrideString != null) {
+ serializer.attribute(null, "cpuAbiOverride", pkg.cpuAbiOverrideString);
+ }
if (pkg.sharedUser == null) {
serializer.attribute(null, "userId", Integer.toString(pkg.appId));
@@ -1938,6 +1948,9 @@
if (pkg.secondaryCpuAbiString != null) {
serializer.attribute(null, "secondaryCpuAbi", pkg.secondaryCpuAbiString);
}
+ if (pkg.cpuAbiOverrideString != null) {
+ serializer.attribute(null, "cpuAbiOverride", pkg.cpuAbiOverrideString);
+ }
serializer.attribute(null, "flags", Integer.toString(pkg.pkgFlags));
serializer.attribute(null, "ft", Long.toHexString(pkg.timeStamp));
@@ -2248,8 +2261,8 @@
PackageSetting p = getPackageLPw(pp.name, null, pp.realName,
(SharedUserSetting) idObj, pp.codePath, pp.resourcePath,
pp.legacyNativeLibraryPathString, pp.primaryCpuAbiString,
- pp.secondaryCpuAbiString, pp.versionCode, pp.pkgFlags,
- null, true /* add */, false /* allowInstall */);
+ pp.secondaryCpuAbiString, pp.versionCode, pp.pkgFlags, null,
+ true /* add */, false /* allowInstall */);
if (p == null) {
PackageManagerService.reportSettingsProblem(Log.WARN,
"Unable to create application package for " + pp.name);
@@ -2673,6 +2686,7 @@
String primaryCpuAbiStr = parser.getAttributeValue(null, "primaryCpuAbi");
String secondaryCpuAbiStr = parser.getAttributeValue(null, "secondaryCpuAbi");
+ String cpuAbiOverrideStr = parser.getAttributeValue(null, "cpuAbiOverride");
if (primaryCpuAbiStr == null && legacyCpuAbiStr != null) {
primaryCpuAbiStr = legacyCpuAbiStr;
@@ -2698,7 +2712,7 @@
}
PackageSetting ps = new PackageSetting(name, realName, codePathFile,
new File(resourcePathStr), legacyNativeLibraryPathStr, primaryCpuAbiStr,
- secondaryCpuAbiStr, versionCode, pkgFlags);
+ secondaryCpuAbiStr, cpuAbiOverrideStr, versionCode, pkgFlags);
String timeStampStr = parser.getAttributeValue(null, "ft");
if (timeStampStr != null) {
try {
@@ -2768,6 +2782,7 @@
String legacyNativeLibraryPathStr = null;
String primaryCpuAbiString = null;
String secondaryCpuAbiString = null;
+ String cpuAbiOverrideString = null;
String systemStr = null;
String installerPackageName = null;
String uidError = null;
@@ -2792,6 +2807,7 @@
legacyNativeLibraryPathStr = parser.getAttributeValue(null, "nativeLibraryPath");
primaryCpuAbiString = parser.getAttributeValue(null, "primaryCpuAbi");
secondaryCpuAbiString = parser.getAttributeValue(null, "secondaryCpuAbi");
+ cpuAbiOverrideString = parser.getAttributeValue(null, "cpuAbiOverride");
if (primaryCpuAbiString == null && legacyCpuAbiString != null) {
primaryCpuAbiString = legacyCpuAbiString;
@@ -2874,7 +2890,7 @@
} else if (userId > 0) {
packageSetting = addPackageLPw(name.intern(), realName, new File(codePathStr),
new File(resourcePathStr), legacyNativeLibraryPathStr, primaryCpuAbiString,
- secondaryCpuAbiString, userId, versionCode, pkgFlags);
+ secondaryCpuAbiString, cpuAbiOverrideString, userId, versionCode, pkgFlags);
if (PackageManagerService.DEBUG_SETTINGS)
Log.i(PackageManagerService.TAG, "Reading package " + name + ": userId="
+ userId + " pkg=" + packageSetting);
@@ -2892,7 +2908,8 @@
if (userId > 0) {
packageSetting = new PendingPackage(name.intern(), realName, new File(
codePathStr), new File(resourcePathStr), legacyNativeLibraryPathStr,
- primaryCpuAbiString, legacyCpuAbiString, userId, versionCode, pkgFlags);
+ primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,
+ userId, versionCode, pkgFlags);
packageSetting.setTimeStamp(timeStamp);
packageSetting.firstInstallTime = firstInstallTime;
packageSetting.lastUpdateTime = lastUpdateTime;
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 33ecc4d..ad87993 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -125,6 +125,10 @@
// Number of attempts before jumping to the next BACKOFF_TIMES slot
private static final int BACKOFF_INC_INTERVAL = 5;
+ // Maximum number of managed profiles permitted is 1. This cannot be increased
+ // without first making sure that the rest of the framework is prepared for it.
+ private static final int MAX_MANAGED_PROFILES = 1;
+
// Amount of time to force the user to wait before entering the PIN again, after failing
// BACKOFF_INC_INTERVAL times.
private static final int[] BACKOFF_TIMES = { 0, 30*1000, 60*1000, 5*60*1000, 30*60*1000 };
@@ -510,7 +514,8 @@
// Skip over users being removed
for (int i = 0; i < totalUserCount; i++) {
UserInfo user = mUsers.valueAt(i);
- if (!mRemovingUserIds.get(user.id)) {
+ if (!mRemovingUserIds.get(user.id)
+ && !user.isGuest()) {
aliveUserCount++;
}
}
@@ -1093,6 +1098,7 @@
Log.w(LOG_TAG, "Cannot add user. DISALLOW_ADD_USER is enabled.");
return null;
}
+ final boolean isGuest = (flags & UserInfo.FLAG_GUEST) != 0;
final long ident = Binder.clearCallingIdentity();
UserInfo userInfo = null;
try {
@@ -1103,7 +1109,21 @@
parent = getUserInfoLocked(parentId);
if (parent == null) return null;
}
- if (isUserLimitReachedLocked()) return null;
+ // If we're not adding a guest user and the limit has been reached,
+ // cannot add a user.
+ if (!isGuest && isUserLimitReachedLocked()) {
+ return null;
+ }
+ // If we're adding a guest and there already exists one, bail.
+ if (isGuest && numberOfUsersOfTypeLocked(UserInfo.FLAG_GUEST, true) > 0) {
+ return null;
+ }
+ // Limit number of managed profiles that can be created
+ if ((flags & UserInfo.FLAG_MANAGED_PROFILE) != 0
+ && numberOfUsersOfTypeLocked(UserInfo.FLAG_MANAGED_PROFILE, true)
+ >= MAX_MANAGED_PROFILES) {
+ return null;
+ }
int userId = getNextAvailableIdLocked();
userInfo = new UserInfo(userId, name, null, flags);
File userPath = new File(mBaseUserPath, Integer.toString(userId));
@@ -1142,6 +1162,19 @@
return userInfo;
}
+ private int numberOfUsersOfTypeLocked(int flags, boolean excludeDying) {
+ int count = 0;
+ for (int i = mUsers.size() - 1; i >= 0; i--) {
+ UserInfo user = mUsers.valueAt(i);
+ if (!excludeDying || !mRemovingUserIds.get(user.id)) {
+ if ((user.flags & flags) != 0) {
+ count++;
+ }
+ }
+ }
+ return count;
+ }
+
/**
* Removes a user and all data directories created for that user. This method should be called
* after the user's processes have been terminated.
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index 2b4a24a..46497242 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -406,7 +406,6 @@
private void sendNextBroadcast() {
final int powerState;
- final int goToSleepReason;
synchronized (mLock) {
if (mBroadcastedPowerState == POWER_STATE_UNKNOWN) {
// Broadcasted power state is unknown. Send wake up.
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 14cbd66..9734bd4 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -56,10 +56,9 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.SystemService;
+import android.os.Trace;
import android.os.UserHandle;
import android.os.WorkSource;
-import android.os.Parcel;
-import android.os.ServiceManager;
import android.provider.Settings;
import android.service.dreams.DreamManagerInternal;
import android.util.EventLog;
@@ -709,7 +708,6 @@
if (mLowPowerModeEnabled != lowPowerModeEnabled) {
mLowPowerModeEnabled = lowPowerModeEnabled;
powerHintInternal(POWER_HINT_LOW_POWER_MODE, lowPowerModeEnabled ? 1 : 0);
- setSurfaceFlingerLowPowerMode(lowPowerModeEnabled ? 1 : 0);
mLowPowerModeEnabled = lowPowerModeEnabled;
BackgroundThread.getHandler().post(new Runnable() {
@Override
@@ -771,7 +769,7 @@
notifyAcquire = true;
}
- applyWakeLockFlagsOnAcquireLocked(wakeLock);
+ applyWakeLockFlagsOnAcquireLocked(wakeLock, uid);
mDirty |= DIRTY_WAKE_LOCKS;
updatePowerStateLocked();
if (notifyAcquire) {
@@ -796,10 +794,10 @@
return false;
}
- private void applyWakeLockFlagsOnAcquireLocked(WakeLock wakeLock) {
+ private void applyWakeLockFlagsOnAcquireLocked(WakeLock wakeLock, int uid) {
if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0
&& isScreenLock(wakeLock)) {
- wakeUpNoUpdateLocked(SystemClock.uptimeMillis());
+ wakeUpNoUpdateLocked(SystemClock.uptimeMillis(), uid);
}
}
@@ -820,17 +818,12 @@
+ " [" + wakeLock.mTag + "], flags=0x" + Integer.toHexString(flags));
}
- mWakeLocks.remove(index);
- notifyWakeLockReleasedLocked(wakeLock);
- wakeLock.mLock.unlinkToDeath(wakeLock, 0);
-
if ((flags & PowerManager.WAIT_FOR_PROXIMITY_NEGATIVE) != 0) {
mRequestWaitForNegativeProximity = true;
}
- applyWakeLockFlagsOnReleaseLocked(wakeLock);
- mDirty |= DIRTY_WAKE_LOCKS;
- updatePowerStateLocked();
+ wakeLock.mLock.unlinkToDeath(wakeLock, 0);
+ removeWakeLockLocked(wakeLock, index);
}
}
@@ -846,15 +839,19 @@
return;
}
- mWakeLocks.remove(index);
- notifyWakeLockReleasedLocked(wakeLock);
-
- applyWakeLockFlagsOnReleaseLocked(wakeLock);
- mDirty |= DIRTY_WAKE_LOCKS;
- updatePowerStateLocked();
+ removeWakeLockLocked(wakeLock, index);
}
}
+ private void removeWakeLockLocked(WakeLock wakeLock, int index) {
+ mWakeLocks.remove(index);
+ notifyWakeLockReleasedLocked(wakeLock);
+
+ applyWakeLockFlagsOnReleaseLocked(wakeLock);
+ mDirty |= DIRTY_WAKE_LOCKS;
+ updatePowerStateLocked();
+ }
+
private void applyWakeLockFlagsOnReleaseLocked(WakeLock wakeLock) {
if ((wakeLock.mFlags & PowerManager.ON_AFTER_RELEASE) != 0
&& isScreenLock(wakeLock)) {
@@ -865,7 +862,8 @@
}
}
- private void updateWakeLockWorkSourceInternal(IBinder lock, WorkSource ws, String historyTag) {
+ private void updateWakeLockWorkSourceInternal(IBinder lock, WorkSource ws, String historyTag,
+ int callingUid) {
synchronized (mLock) {
int index = findWakeLockIndexLocked(lock);
if (index < 0) {
@@ -873,7 +871,8 @@
Slog.d(TAG, "updateWakeLockWorkSourceInternal: lock=" + Objects.hashCode(lock)
+ " [not found], ws=" + ws);
}
- throw new IllegalArgumentException("Wake lock not active");
+ throw new IllegalArgumentException("Wake lock not active: " + lock
+ + " from uid " + callingUid);
}
WakeLock wakeLock = mWakeLocks.get(index);
@@ -975,36 +974,41 @@
return false;
}
- mNotifier.onUserActivity(event, uid);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "userActivity");
+ try {
+ mNotifier.onUserActivity(event, uid);
- if ((flags & PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS) != 0) {
- if (eventTime > mLastUserActivityTimeNoChangeLights
- && eventTime > mLastUserActivityTime) {
- mLastUserActivityTimeNoChangeLights = eventTime;
- mDirty |= DIRTY_USER_ACTIVITY;
- return true;
+ if ((flags & PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS) != 0) {
+ if (eventTime > mLastUserActivityTimeNoChangeLights
+ && eventTime > mLastUserActivityTime) {
+ mLastUserActivityTimeNoChangeLights = eventTime;
+ mDirty |= DIRTY_USER_ACTIVITY;
+ return true;
+ }
+ } else {
+ if (eventTime > mLastUserActivityTime) {
+ mLastUserActivityTime = eventTime;
+ mDirty |= DIRTY_USER_ACTIVITY;
+ return true;
+ }
}
- } else {
- if (eventTime > mLastUserActivityTime) {
- mLastUserActivityTime = eventTime;
- mDirty |= DIRTY_USER_ACTIVITY;
- return true;
- }
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
return false;
}
- private void wakeUpInternal(long eventTime) {
+ private void wakeUpInternal(long eventTime, int uid) {
synchronized (mLock) {
- if (wakeUpNoUpdateLocked(eventTime)) {
+ if (wakeUpNoUpdateLocked(eventTime, uid)) {
updatePowerStateLocked();
}
}
}
- private boolean wakeUpNoUpdateLocked(long eventTime) {
+ private boolean wakeUpNoUpdateLocked(long eventTime, int uid) {
if (DEBUG_SPEW) {
- Slog.d(TAG, "wakeUpNoUpdateLocked: eventTime=" + eventTime);
+ Slog.d(TAG, "wakeUpNoUpdateLocked: eventTime=" + eventTime + ", uid=" + uid);
}
if (eventTime < mLastSleepTime || mWakefulness == WAKEFULNESS_AWAKE
@@ -1012,31 +1016,36 @@
return false;
}
- switch (mWakefulness) {
- case WAKEFULNESS_ASLEEP:
- Slog.i(TAG, "Waking up from sleep...");
- break;
- case WAKEFULNESS_DREAMING:
- Slog.i(TAG, "Waking up from dream...");
- break;
- case WAKEFULNESS_DOZING:
- Slog.i(TAG, "Waking up from dozing...");
- break;
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "wakeUp");
+ try {
+ switch (mWakefulness) {
+ case WAKEFULNESS_ASLEEP:
+ Slog.i(TAG, "Waking up from sleep (uid " + uid +")...");
+ break;
+ case WAKEFULNESS_DREAMING:
+ Slog.i(TAG, "Waking up from dream (uid " + uid +")...");
+ break;
+ case WAKEFULNESS_DOZING:
+ Slog.i(TAG, "Waking up from dozing (uid " + uid +")...");
+ break;
+ }
+
+ mLastWakeTime = eventTime;
+ mDirty |= DIRTY_WAKEFULNESS;
+ mWakefulness = WAKEFULNESS_AWAKE;
+ setInteractiveStateLocked(true, 0);
+
+ userActivityNoUpdateLocked(
+ eventTime, PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, uid);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
-
- mLastWakeTime = eventTime;
- mDirty |= DIRTY_WAKEFULNESS;
- mWakefulness = WAKEFULNESS_AWAKE;
- setInteractiveStateLocked(true, 0);
-
- userActivityNoUpdateLocked(
- eventTime, PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
return true;
}
- private void goToSleepInternal(long eventTime, int reason, int flags) {
+ private void goToSleepInternal(long eventTime, int reason, int flags, int uid) {
synchronized (mLock) {
- if (goToSleepNoUpdateLocked(eventTime, reason, flags)) {
+ if (goToSleepNoUpdateLocked(eventTime, reason, flags, uid)) {
updatePowerStateLocked();
}
}
@@ -1045,10 +1054,10 @@
// This method is called goToSleep for historical reasons but we actually start
// dozing before really going to sleep.
@SuppressWarnings("deprecation")
- private boolean goToSleepNoUpdateLocked(long eventTime, int reason, int flags) {
+ private boolean goToSleepNoUpdateLocked(long eventTime, int reason, int flags, int uid) {
if (DEBUG_SPEW) {
Slog.d(TAG, "goToSleepNoUpdateLocked: eventTime=" + eventTime
- + ", reason=" + reason + ", flags=" + flags);
+ + ", reason=" + reason + ", flags=" + flags + ", uid=" + uid);
}
if (eventTime < mLastWakeTime
@@ -1058,58 +1067,73 @@
return false;
}
- switch (reason) {
- case PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN:
- Slog.i(TAG, "Going to sleep due to device administration policy...");
- break;
- case PowerManager.GO_TO_SLEEP_REASON_TIMEOUT:
- Slog.i(TAG, "Going to sleep due to screen timeout...");
- break;
- default:
- Slog.i(TAG, "Going to sleep by user request...");
- reason = PowerManager.GO_TO_SLEEP_REASON_USER;
- break;
- }
-
- mLastSleepTime = eventTime;
- mDirty |= DIRTY_WAKEFULNESS;
- mWakefulness = WAKEFULNESS_DOZING;
- mSandmanSummoned = true;
- setInteractiveStateLocked(false, reason);
-
- // Report the number of wake locks that will be cleared by going to sleep.
- int numWakeLocksCleared = 0;
- final int numWakeLocks = mWakeLocks.size();
- for (int i = 0; i < numWakeLocks; i++) {
- final WakeLock wakeLock = mWakeLocks.get(i);
- switch (wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) {
- case PowerManager.FULL_WAKE_LOCK:
- case PowerManager.SCREEN_BRIGHT_WAKE_LOCK:
- case PowerManager.SCREEN_DIM_WAKE_LOCK:
- numWakeLocksCleared += 1;
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "goToSleep");
+ try {
+ switch (reason) {
+ case PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN:
+ Slog.i(TAG, "Going to sleep due to device administration policy "
+ + "(uid " + uid +")...");
+ break;
+ case PowerManager.GO_TO_SLEEP_REASON_TIMEOUT:
+ Slog.i(TAG, "Going to sleep due to screen timeout (uid " + uid +")...");
+ break;
+ case PowerManager.GO_TO_SLEEP_REASON_LID_SWITCH:
+ Slog.i(TAG, "Going to sleep due to lid switch (uid " + uid +")...");
+ break;
+ case PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON:
+ Slog.i(TAG, "Going to sleep due to power button (uid " + uid +")...");
+ break;
+ case PowerManager.GO_TO_SLEEP_REASON_HDMI:
+ Slog.i(TAG, "Going to sleep due to HDMI standby (uid " + uid +")...");
+ break;
+ default:
+ Slog.i(TAG, "Going to sleep by application request (uid " + uid +")...");
+ reason = PowerManager.GO_TO_SLEEP_REASON_APPLICATION;
break;
}
- }
- EventLog.writeEvent(EventLogTags.POWER_SLEEP_REQUESTED, numWakeLocksCleared);
- // Skip dozing if requested.
- if ((flags & PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE) != 0) {
- reallyGoToSleepNoUpdateLocked(eventTime);
+ mLastSleepTime = eventTime;
+ mDirty |= DIRTY_WAKEFULNESS;
+ mWakefulness = WAKEFULNESS_DOZING;
+ mSandmanSummoned = true;
+ setInteractiveStateLocked(false, reason);
+
+ // Report the number of wake locks that will be cleared by going to sleep.
+ int numWakeLocksCleared = 0;
+ final int numWakeLocks = mWakeLocks.size();
+ for (int i = 0; i < numWakeLocks; i++) {
+ final WakeLock wakeLock = mWakeLocks.get(i);
+ switch (wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) {
+ case PowerManager.FULL_WAKE_LOCK:
+ case PowerManager.SCREEN_BRIGHT_WAKE_LOCK:
+ case PowerManager.SCREEN_DIM_WAKE_LOCK:
+ numWakeLocksCleared += 1;
+ break;
+ }
+ }
+ EventLog.writeEvent(EventLogTags.POWER_SLEEP_REQUESTED, numWakeLocksCleared);
+
+ // Skip dozing if requested.
+ if ((flags & PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE) != 0) {
+ reallyGoToSleepNoUpdateLocked(eventTime, uid);
+ }
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
return true;
}
- private void napInternal(long eventTime) {
+ private void napInternal(long eventTime, int uid) {
synchronized (mLock) {
- if (napNoUpdateLocked(eventTime)) {
+ if (napNoUpdateLocked(eventTime, uid)) {
updatePowerStateLocked();
}
}
}
- private boolean napNoUpdateLocked(long eventTime) {
+ private boolean napNoUpdateLocked(long eventTime, int uid) {
if (DEBUG_SPEW) {
- Slog.d(TAG, "napNoUpdateLocked: eventTime=" + eventTime);
+ Slog.d(TAG, "napNoUpdateLocked: eventTime=" + eventTime + ", uid=" + uid);
}
if (eventTime < mLastWakeTime || mWakefulness != WAKEFULNESS_AWAKE
@@ -1117,19 +1141,25 @@
return false;
}
- Slog.i(TAG, "Nap time...");
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "nap");
+ try {
+ Slog.i(TAG, "Nap time (uid " + uid +")...");
- mDirty |= DIRTY_WAKEFULNESS;
- mWakefulness = WAKEFULNESS_DREAMING;
- mSandmanSummoned = true;
- setInteractiveStateLocked(true, 0);
+ mDirty |= DIRTY_WAKEFULNESS;
+ mWakefulness = WAKEFULNESS_DREAMING;
+ mSandmanSummoned = true;
+ setInteractiveStateLocked(true, 0);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
return true;
}
// Done dozing, drop everything and go to sleep.
- private boolean reallyGoToSleepNoUpdateLocked(long eventTime) {
+ private boolean reallyGoToSleepNoUpdateLocked(long eventTime, int uid) {
if (DEBUG_SPEW) {
- Slog.d(TAG, "reallyGoToSleepNoUpdateLocked: eventTime=" + eventTime);
+ Slog.d(TAG, "reallyGoToSleepNoUpdateLocked: eventTime=" + eventTime
+ + ", uid=" + uid);
}
if (eventTime < mLastWakeTime || mWakefulness == WAKEFULNESS_ASLEEP
@@ -1137,11 +1167,16 @@
return false;
}
- Slog.i(TAG, "Sleeping...");
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "reallyGoToSleep");
+ try {
+ Slog.i(TAG, "Sleeping (uid " + uid +")...");
- mDirty |= DIRTY_WAKEFULNESS;
- mWakefulness = WAKEFULNESS_ASLEEP;
- setInteractiveStateLocked(false, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);
+ mDirty |= DIRTY_WAKEFULNESS;
+ mWakefulness = WAKEFULNESS_ASLEEP;
+ setInteractiveStateLocked(false, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
return true;
}
@@ -1178,40 +1213,45 @@
Slog.wtf(TAG, "Power manager lock was not held when calling updatePowerStateLocked");
}
- // Phase 0: Basic state updates.
- updateIsPoweredLocked(mDirty);
- updateStayOnLocked(mDirty);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "updatePowerState");
+ try {
+ // Phase 0: Basic state updates.
+ updateIsPoweredLocked(mDirty);
+ updateStayOnLocked(mDirty);
- // Phase 1: Update wakefulness.
- // Loop because the wake lock and user activity computations are influenced
- // by changes in wakefulness.
- final long now = SystemClock.uptimeMillis();
- int dirtyPhase2 = 0;
- for (;;) {
- int dirtyPhase1 = mDirty;
- dirtyPhase2 |= dirtyPhase1;
- mDirty = 0;
+ // Phase 1: Update wakefulness.
+ // Loop because the wake lock and user activity computations are influenced
+ // by changes in wakefulness.
+ final long now = SystemClock.uptimeMillis();
+ int dirtyPhase2 = 0;
+ for (;;) {
+ int dirtyPhase1 = mDirty;
+ dirtyPhase2 |= dirtyPhase1;
+ mDirty = 0;
- updateWakeLockSummaryLocked(dirtyPhase1);
- updateUserActivitySummaryLocked(now, dirtyPhase1);
- if (!updateWakefulnessLocked(dirtyPhase1)) {
- break;
+ updateWakeLockSummaryLocked(dirtyPhase1);
+ updateUserActivitySummaryLocked(now, dirtyPhase1);
+ if (!updateWakefulnessLocked(dirtyPhase1)) {
+ break;
+ }
}
+
+ // Phase 2: Update dreams and display power state.
+ updateDreamLocked(dirtyPhase2);
+ updateDisplayPowerStateLocked(dirtyPhase2);
+
+ // Phase 3: Send notifications, if needed.
+ if (mDisplayReady) {
+ finishInteractiveStateChangeLocked();
+ }
+
+ // Phase 4: Update suspend blocker.
+ // Because we might release the last suspend blocker here, we need to make sure
+ // we finished everything else first!
+ updateSuspendBlockerLocked();
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
-
- // Phase 2: Update dreams and display power state.
- updateDreamLocked(dirtyPhase2);
- updateDisplayPowerStateLocked(dirtyPhase2);
-
- // Phase 3: Send notifications, if needed.
- if (mDisplayReady) {
- finishInteractiveStateChangeLocked();
- }
-
- // Phase 4: Update suspend blocker.
- // Because we might release the last suspend blocker here, we need to make sure
- // we finished everything else first!
- updateSuspendBlockerLocked();
}
/**
@@ -1251,7 +1291,7 @@
final long now = SystemClock.uptimeMillis();
if (shouldWakeUpWhenPluggedOrUnpluggedLocked(wasPowered, oldPlugType,
dockedOnWirelessCharger)) {
- wakeUpNoUpdateLocked(now);
+ wakeUpNoUpdateLocked(now, Process.SYSTEM_UID);
}
userActivityNoUpdateLocked(
now, PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
@@ -1509,10 +1549,10 @@
}
final long time = SystemClock.uptimeMillis();
if (shouldNapAtBedTimeLocked()) {
- changed = napNoUpdateLocked(time);
+ changed = napNoUpdateLocked(time, Process.SYSTEM_UID);
} else {
changed = goToSleepNoUpdateLocked(time,
- PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, 0);
+ PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, 0, Process.SYSTEM_UID);
}
}
}
@@ -1659,10 +1699,10 @@
// Dream has ended or will be stopped. Update the power state.
if (isItBedTimeYetLocked()) {
goToSleepNoUpdateLocked(SystemClock.uptimeMillis(),
- PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, 0);
+ PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, 0, Process.SYSTEM_UID);
updatePowerStateLocked();
} else {
- wakeUpNoUpdateLocked(SystemClock.uptimeMillis());
+ wakeUpNoUpdateLocked(SystemClock.uptimeMillis(), Process.SYSTEM_UID);
updatePowerStateLocked();
}
} else if (wakefulness == WAKEFULNESS_DOZING) {
@@ -1671,7 +1711,7 @@
}
// Doze has ended or will be stopped. Update the power state.
- reallyGoToSleepNoUpdateLocked(SystemClock.uptimeMillis());
+ reallyGoToSleepNoUpdateLocked(SystemClock.uptimeMillis(), Process.SYSTEM_UID);
updatePowerStateLocked();
}
}
@@ -1982,7 +2022,12 @@
Slog.d(TAG, "Setting HAL auto-suspend mode to " + enable);
}
mHalAutoSuspendModeEnabled = enable;
- nativeSetAutoSuspend(enable);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "setHalAutoSuspend(" + enable + ")");
+ try {
+ nativeSetAutoSuspend(enable);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
}
}
@@ -1992,7 +2037,12 @@
Slog.d(TAG, "Setting HAL interactive mode to " + enable);
}
mHalInteractiveModeEnabled = enable;
- nativeSetInteractive(enable);
+ Trace.traceBegin(Trace.TRACE_TAG_POWER, "setHalInteractive(" + enable + ")");
+ try {
+ nativeSetInteractive(enable);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_POWER);
+ }
}
}
@@ -2187,21 +2237,6 @@
nativeSendPowerHint(hintId, data);
}
- private static void setSurfaceFlingerLowPowerMode(int enabled) {
- try {
- final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
- if (flinger != null) {
- final Parcel data = Parcel.obtain();
- data.writeInterfaceToken("android.ui.ISurfaceComposer");
- data.writeInt(enabled);
- flinger.transact(1016, data, null, 0);
- data.recycle();
- }
- } catch (RemoteException ex) {
- Slog.e(TAG, "Failed to reduce refresh rate", ex);
- }
- }
-
/**
* Low-level function turn the device off immediately, without trying
* to be clean. Most people should use {@link ShutdownThread} for a clean shutdown.
@@ -2594,20 +2629,23 @@
private final class SuspendBlockerImpl implements SuspendBlocker {
private final String mName;
+ private final String mTraceName;
private int mReferenceCount;
public SuspendBlockerImpl(String name) {
mName = name;
+ mTraceName = "SuspendBlocker (" + name + ")";
}
@Override
protected void finalize() throws Throwable {
try {
if (mReferenceCount != 0) {
- Log.wtf(TAG, "Suspend blocker \"" + mName
+ Slog.wtf(TAG, "Suspend blocker \"" + mName
+ "\" was finalized without being released!");
mReferenceCount = 0;
nativeReleaseSuspendBlocker(mName);
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, mTraceName, 0);
}
} finally {
super.finalize();
@@ -2622,6 +2660,7 @@
if (DEBUG_SPEW) {
Slog.d(TAG, "Acquiring suspend blocker \"" + mName + "\".");
}
+ Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, mTraceName, 0);
nativeAcquireSuspendBlocker(mName);
}
}
@@ -2636,8 +2675,9 @@
Slog.d(TAG, "Releasing suspend blocker \"" + mName + "\".");
}
nativeReleaseSuspendBlocker(mName);
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, mTraceName, 0);
} else if (mReferenceCount < 0) {
- Log.wtf(TAG, "Suspend blocker \"" + mName
+ Slog.wtf(TAG, "Suspend blocker \"" + mName
+ "\" was released without being acquired!", new Throwable());
mReferenceCount = 0;
}
@@ -2653,6 +2693,8 @@
}
private final class ScreenOnBlockerImpl implements ScreenOnBlocker {
+ private static final String TRACE_NAME = "ScreenOnBlocker";
+
private int mNestCount;
public boolean isHeld() {
@@ -2665,9 +2707,12 @@
public void acquire() {
synchronized (this) {
mNestCount += 1;
- if (DEBUG) {
+ if (DEBUG || true) {
Slog.d(TAG, "Screen on blocked: mNestCount=" + mNestCount);
}
+ if (mNestCount == 1) {
+ Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, TRACE_NAME, 0);
+ }
}
}
@@ -2675,17 +2720,17 @@
public void release() {
synchronized (this) {
mNestCount -= 1;
- if (mNestCount < 0) {
- Log.wtf(TAG, "Screen on blocker was released without being acquired!",
+ if (mNestCount == 0) {
+ if (DEBUG || true) {
+ Slog.d(TAG, "Screen on unblocked: mNestCount=" + mNestCount);
+ }
+ mHandler.sendEmptyMessage(MSG_SCREEN_ON_BLOCKER_RELEASED);
+ Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, TRACE_NAME, 0);
+ } else if (mNestCount < 0) {
+ Slog.wtf(TAG, "Screen on blocker was released without being acquired!",
new Throwable());
mNestCount = 0;
}
- if (mNestCount == 0) {
- mHandler.sendEmptyMessage(MSG_SCREEN_ON_BLOCKER_RELEASED);
- }
- if (DEBUG) {
- Slog.d(TAG, "Screen on unblocked: mNestCount=" + mNestCount);
- }
}
}
@@ -2791,9 +2836,10 @@
ws = null;
}
+ final int callingUid = Binder.getCallingUid();
final long ident = Binder.clearCallingIdentity();
try {
- updateWakeLockWorkSourceInternal(lock, ws, historyTag);
+ updateWakeLockWorkSourceInternal(lock, ws, historyTag, callingUid);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -2852,9 +2898,10 @@
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.DEVICE_POWER, null);
+ final int uid = Binder.getCallingUid();
final long ident = Binder.clearCallingIdentity();
try {
- wakeUpInternal(eventTime);
+ wakeUpInternal(eventTime, uid);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -2869,9 +2916,10 @@
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.DEVICE_POWER, null);
+ final int uid = Binder.getCallingUid();
final long ident = Binder.clearCallingIdentity();
try {
- goToSleepInternal(eventTime, reason, flags);
+ goToSleepInternal(eventTime, reason, flags, uid);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -2886,9 +2934,10 @@
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.DEVICE_POWER, null);
+ final int uid = Binder.getCallingUid();
final long ident = Binder.clearCallingIdentity();
try {
- napInternal(eventTime);
+ napInternal(eventTime, uid);
} finally {
Binder.restoreCallingIdentity(ident);
}
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 21905f0..f85e2d9 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -22,7 +22,6 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
-import android.service.notification.StatusBarNotification;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -39,18 +38,14 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* A note on locking: We rely on the fact that calls onto mBar are oneway or
* if they are local, that they just enqueue messages to not deadlock.
*/
-public class StatusBarManagerService extends IStatusBarService.Stub
- implements WindowManagerService.OnHardKeyboardStatusChangeListener
-{
+public class StatusBarManagerService extends IStatusBarService.Stub {
private static final String TAG = "StatusBarManagerService";
private static final boolean SPEW = false;
@@ -95,7 +90,6 @@
public StatusBarManagerService(Context context, WindowManagerService windowManager) {
mContext = context;
mWindowManager = windowManager;
- mWindowManager.setOnHardKeyboardStatusChangeListener(this);
final Resources res = context.getResources();
mIcons.defineSlots(res.getStringArray(com.android.internal.R.array.config_statusBarIcons));
@@ -190,10 +184,6 @@
@Override
public void disable(int what, IBinder token, String pkg) {
- if (!mNotificationDelegate.allowDisable(what, token, pkg)) {
- if (SPEW) Slog.d(TAG, "Blocking disable request from " + pkg);
- return;
- }
disableInternal(mCurrentUserId, what, token, pkg);
}
@@ -394,29 +384,6 @@
}
@Override
- public void setHardKeyboardEnabled(final boolean enabled) {
- mHandler.post(new Runnable() {
- public void run() {
- mWindowManager.setHardKeyboardEnabled(enabled);
- }
- });
- }
-
- @Override
- public void onHardKeyboardStatusChange(final boolean available, final boolean enabled) {
- mHandler.post(new Runnable() {
- public void run() {
- if (mBar != null) {
- try {
- mBar.setHardKeyboardStatus(available, enabled);
- } catch (RemoteException ex) {
- }
- }
- }
- });
- }
-
- @Override
public void toggleRecentApps() {
if (mBar != null) {
try {
@@ -510,11 +477,9 @@
switches[2] = mMenuVisible ? 1 : 0;
switches[3] = mImeWindowVis;
switches[4] = mImeBackDisposition;
- switches[7] = mShowImeSwitcher ? 1 : 0;
+ switches[5] = mShowImeSwitcher ? 1 : 0;
binders.add(mImeToken);
}
- switches[5] = mWindowManager.isHardKeyboardAvailable() ? 1 : 0;
- switches[6] = mWindowManager.isHardKeyboardEnabled() ? 1 : 0;
}
/**
diff --git a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
index eb38f4a..468a344 100644
--- a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
+++ b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
@@ -453,6 +453,8 @@
notification.icon = com.android.internal.R.drawable.stat_notify_disk_full;
notification.tickerText = title;
notification.flags |= Notification.FLAG_NO_CLEAR;
+ notification.color = context.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(context, title, details, intent);
notification.visibility = Notification.VISIBILITY_PUBLIC;
notification.category = Notification.CATEGORY_SYSTEM;
diff --git a/services/core/java/com/android/server/trust/TrustArchive.java b/services/core/java/com/android/server/trust/TrustArchive.java
index d4ed86d..7253716 100644
--- a/services/core/java/com/android/server/trust/TrustArchive.java
+++ b/services/core/java/com/android/server/trust/TrustArchive.java
@@ -129,8 +129,8 @@
}
switch (ev.type) {
case TYPE_GRANT_TRUST:
- writer.printf(", message=\"%s\", duration=%s",
- ev.message, formatDuration(ev.duration));
+ writer.printf(", message=\"%s\", duration=%s, initiatedByUser=%d",
+ ev.message, formatDuration(ev.duration), ev.userInitiated ? 1 : 0);
break;
case TYPE_MANAGING_TRUST:
writer.printf(", managingTrust=" + ev.managingTrust);
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index badead6..490536e 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -93,7 +93,7 @@
private final ArraySet<AgentInfo> mActiveAgents = new ArraySet<AgentInfo>();
private final ArrayList<ITrustListener> mTrustListeners = new ArrayList<ITrustListener>();
- private final DevicePolicyReceiver mDevicePolicyReceiver = new DevicePolicyReceiver();
+ private final Receiver mReceiver = new Receiver();
private final SparseBooleanArray mUserHasAuthenticatedSinceBoot = new SparseBooleanArray();
/* package */ final TrustArchive mArchive = new TrustArchive();
private final Context mContext;
@@ -115,7 +115,7 @@
public void onBootPhase(int phase) {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY && !isSafeMode()) {
mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);
- mDevicePolicyReceiver.register(mContext);
+ mReceiver.register(mContext);
refreshAgentList();
}
}
@@ -373,7 +373,13 @@
}
}
- if (successful && !mUserHasAuthenticatedSinceBoot.get(userId)) {
+ if (successful) {
+ updateUserHasAuthenticated(userId);
+ }
+ }
+
+ private void updateUserHasAuthenticated(int userId) {
+ if (!mUserHasAuthenticatedSinceBoot.get(userId)) {
mUserHasAuthenticatedSinceBoot.put(userId, true);
updateTrust(userId, false);
}
@@ -597,7 +603,7 @@
}
};
- private class DevicePolicyReceiver extends BroadcastReceiver {
+ private class Receiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
@@ -605,14 +611,18 @@
intent.getAction())) {
refreshAgentList();
updateDevicePolicyFeatures(getSendingUserId());
+ } else if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) {
+ updateUserHasAuthenticated(getSendingUserId());
}
}
public void register(Context context) {
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
+ filter.addAction(Intent.ACTION_USER_PRESENT);
context.registerReceiverAsUser(this,
UserHandle.ALL,
- new IntentFilter(
- DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED),
+ filter,
null /* permission */,
null /* scheduler */);
}
diff --git a/services/core/java/com/android/server/tv/PersistentDataStore.java b/services/core/java/com/android/server/tv/PersistentDataStore.java
index 852e640..fcfaaea 100644
--- a/services/core/java/com/android/server/tv/PersistentDataStore.java
+++ b/services/core/java/com/android/server/tv/PersistentDataStore.java
@@ -20,6 +20,7 @@
import android.content.Intent;
import android.media.tv.TvContentRating;
import android.media.tv.TvInputManager;
+import android.os.Environment;
import android.os.Handler;
import android.os.UserHandle;
import android.text.TextUtils;
@@ -44,6 +45,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -68,7 +70,8 @@
// The atomic file used to safely read or write the file.
private final AtomicFile mAtomicFile;
- private final List<TvContentRating> mBlockedRatings = new ArrayList<TvContentRating>();
+ private final List<TvContentRating> mBlockedRatings =
+ Collections.synchronizedList(new ArrayList<TvContentRating>());
private boolean mBlockedRatingsChanged;
@@ -81,8 +84,13 @@
public PersistentDataStore(Context context, int userId) {
mContext = context;
- mAtomicFile = new AtomicFile(new File("/data/system/tv/" + userId
- + "/tv-input-manager-state.xml"));
+ File userDir = Environment.getUserSystemDirectory(userId);
+ if (!userDir.exists()) {
+ if (!userDir.mkdirs()) {
+ throw new IllegalStateException("User dir cannot be created: " + userDir);
+ }
+ }
+ mAtomicFile = new AtomicFile(new File(userDir, "tv-input-manager-state.xml"));
}
public boolean isParentalControlsEnabled() {
@@ -91,6 +99,7 @@
}
public void setParentalControlsEnabled(boolean enabled) {
+ loadIfNeeded();
if (mParentalControlsEnabled != enabled) {
mParentalControlsEnabled = enabled;
mParentalControlsEnabledChanged = true;
@@ -100,9 +109,11 @@
public boolean isRatingBlocked(TvContentRating rating) {
loadIfNeeded();
- for (TvContentRating blcokedRating : mBlockedRatings) {
- if (rating.contains(blcokedRating)) {
- return true;
+ synchronized (mBlockedRatings) {
+ for (TvContentRating blcokedRating : mBlockedRatings) {
+ if (rating.contains(blcokedRating)) {
+ return true;
+ }
}
}
return false;
@@ -114,6 +125,7 @@
}
public void addBlockedRating(TvContentRating rating) {
+ loadIfNeeded();
if (rating != null && !mBlockedRatings.contains(rating)) {
mBlockedRatings.add(rating);
mBlockedRatingsChanged = true;
@@ -122,6 +134,7 @@
}
public void removeBlockedRating(TvContentRating rating) {
+ loadIfNeeded();
if (rating != null && mBlockedRatings.contains(rating)) {
mBlockedRatings.remove(rating);
mBlockedRatingsChanged = true;
@@ -262,10 +275,12 @@
serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
serializer.startTag(null, TAG_TV_INPUT_MANAGER_STATE);
serializer.startTag(null, TAG_BLOCKED_RATINGS);
- for (TvContentRating rating : mBlockedRatings) {
- serializer.startTag(null, TAG_RATING);
- serializer.attribute(null, ATTR_STRING, rating.flattenToString());
- serializer.endTag(null, TAG_RATING);
+ synchronized (mBlockedRatings) {
+ for (TvContentRating rating : mBlockedRatings) {
+ serializer.startTag(null, TAG_RATING);
+ serializer.attribute(null, ATTR_STRING, rating.flattenToString());
+ serializer.endTag(null, TAG_RATING);
+ }
}
serializer.endTag(null, TAG_BLOCKED_RATINGS);
serializer.startTag(null, TAG_PARENTAL_CONTROLS);
diff --git a/services/core/java/com/android/server/tv/TvInputHal.java b/services/core/java/com/android/server/tv/TvInputHal.java
index e7dd82d..c7d95aa 100644
--- a/services/core/java/com/android/server/tv/TvInputHal.java
+++ b/services/core/java/com/android/server/tv/TvInputHal.java
@@ -19,12 +19,11 @@
import android.media.tv.TvInputHardwareInfo;
import android.media.tv.TvStreamConfig;
import android.os.Handler;
-import android.os.HandlerThread;
import android.os.Message;
-import android.view.Surface;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
+import android.view.Surface;
import java.util.LinkedList;
import java.util.Queue;
@@ -64,12 +63,12 @@
int generation);
private static native void nativeClose(long ptr);
- private Object mLock = new Object();
+ private final Object mLock = new Object();
private long mPtr = 0;
private final Callback mCallback;
private final Handler mHandler;
- private SparseIntArray mStreamConfigGenerations = new SparseIntArray();
- private SparseArray<TvStreamConfig[]> mStreamConfigs = new SparseArray<>();;
+ private final SparseIntArray mStreamConfigGenerations = new SparseIntArray();
+ private final SparseArray<TvStreamConfig[]> mStreamConfigs = new SparseArray<>();
public TvInputHal(Callback callback) {
mCallback = callback;
@@ -153,7 +152,7 @@
// Handler.Callback implementation
- private Queue<Message> mPendingMessageQueue = new LinkedList<Message>();
+ private final Queue<Message> mPendingMessageQueue = new LinkedList<Message>();
@Override
public boolean handleMessage(Message msg) {
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index c916507..fa991c2 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -20,14 +20,12 @@
import static android.media.tv.TvInputManager.INPUT_STATE_DISCONNECTED;
import android.content.Context;
-import android.content.Intent;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiHotplugEvent;
import android.hardware.hdmi.IHdmiControlService;
import android.hardware.hdmi.IHdmiDeviceEventListener;
import android.hardware.hdmi.IHdmiHotplugEventListener;
-import android.hardware.hdmi.IHdmiInputChangeListener;
import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener;
import android.media.AudioDevicePort;
import android.media.AudioFormat;
@@ -39,7 +37,6 @@
import android.media.AudioPortConfig;
import android.media.tv.ITvInputHardware;
import android.media.tv.ITvInputHardwareCallback;
-import android.media.tv.TvContract;
import android.media.tv.TvInputHardwareInfo;
import android.media.tv.TvInputInfo;
import android.media.tv.TvStreamConfig;
@@ -55,6 +52,7 @@
import android.view.KeyEvent;
import android.view.Surface;
+import com.android.internal.os.SomeArgs;
import com.android.server.SystemService;
import java.util.ArrayList;
@@ -76,7 +74,6 @@
class TvInputHardwareManager implements TvInputHal.Callback {
private static final String TAG = TvInputHardwareManager.class.getSimpleName();
- private final Context mContext;
private final Listener mListener;
private final TvInputHal mHal = new TvInputHal(this);
private final SparseArray<Connection> mConnections = new SparseArray<>();
@@ -106,7 +103,6 @@
private final Object mLock = new Object();
public TvInputHardwareManager(Context context, Listener listener) {
- mContext = context;
mListener = listener;
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mHal.init();
@@ -284,7 +280,7 @@
return -1;
}
- public void addHdmiTvInput(int logicalAddress, TvInputInfo info) {
+ public void addHdmiTvInput(int id, TvInputInfo info) {
if (info.getType() != TvInputInfo.TYPE_HDMI) {
throw new IllegalArgumentException("info (" + info + ") has non-HDMI type.");
}
@@ -294,13 +290,13 @@
if (parentIndex < 0) {
throw new IllegalArgumentException("info (" + info + ") has invalid parentId.");
}
- String oldInputId = mHdmiInputIdMap.get(logicalAddress);
+ String oldInputId = mHdmiInputIdMap.get(id);
if (oldInputId != null) {
Slog.w(TAG, "Trying to override previous registration: old = "
- + mInputMap.get(oldInputId) + ":" + logicalAddress + ", new = "
- + info + ":" + logicalAddress);
+ + mInputMap.get(oldInputId) + ":" + id + ", new = "
+ + info + ":" + id);
}
- mHdmiInputIdMap.put(logicalAddress, info.getId());
+ mHdmiInputIdMap.put(id, info.getId());
mInputMap.put(info.getId(), info);
}
}
@@ -877,7 +873,7 @@
public void onHardwareDeviceRemoved(TvInputHardwareInfo info);
public void onHdmiDeviceAdded(HdmiDeviceInfo device);
public void onHdmiDeviceRemoved(HdmiDeviceInfo device);
- public void onHdmiDeviceUpdated(HdmiDeviceInfo device);
+ public void onHdmiDeviceUpdated(String inputId, HdmiDeviceInfo device);
}
private class ListenerHandler extends Handler {
@@ -918,8 +914,11 @@
break;
}
case HDMI_DEVICE_UPDATED: {
- HdmiDeviceInfo info = (HdmiDeviceInfo) msg.obj;
- mListener.onHdmiDeviceUpdated(info);
+ SomeArgs args = (SomeArgs) msg.obj;
+ String inputId = (String) args.arg1;
+ HdmiDeviceInfo info = (HdmiDeviceInfo) args.arg2;
+ args.recycle();
+ mListener.onHdmiDeviceUpdated(inputId, info);
}
default: {
Slog.w(TAG, "Unhandled message: " + msg);
@@ -956,37 +955,47 @@
public void onStatusChanged(HdmiDeviceInfo deviceInfo, int status) {
synchronized (mLock) {
int messageType = 0;
+ Object obj = null;
switch (status) {
case HdmiControlManager.DEVICE_EVENT_ADD_DEVICE: {
- if (!mHdmiDeviceList.contains(deviceInfo)) {
+ if (findHdmiDeviceInfo(deviceInfo.getId()) == null) {
mHdmiDeviceList.add(deviceInfo);
} else {
Slog.w(TAG, "The list already contains " + deviceInfo + "; ignoring.");
return;
}
messageType = ListenerHandler.HDMI_DEVICE_ADDED;
+ obj = deviceInfo;
break;
}
case HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE: {
- if (!mHdmiDeviceList.remove(deviceInfo)) {
+ HdmiDeviceInfo originalDeviceInfo = findHdmiDeviceInfo(deviceInfo.getId());
+ if (!mHdmiDeviceList.remove(originalDeviceInfo)) {
Slog.w(TAG, "The list doesn't contain " + deviceInfo + "; ignoring.");
return;
}
messageType = ListenerHandler.HDMI_DEVICE_REMOVED;
+ obj = deviceInfo;
break;
}
case HdmiControlManager.DEVICE_EVENT_UPDATE_DEVICE: {
- if (!mHdmiDeviceList.remove(deviceInfo)) {
+ HdmiDeviceInfo originalDeviceInfo = findHdmiDeviceInfo(deviceInfo.getId());
+ if (!mHdmiDeviceList.remove(originalDeviceInfo)) {
Slog.w(TAG, "The list doesn't contain " + deviceInfo + "; ignoring.");
return;
}
mHdmiDeviceList.add(deviceInfo);
messageType = ListenerHandler.HDMI_DEVICE_UPDATED;
+ String inputId = mHdmiInputIdMap.get(deviceInfo.getId());
+ SomeArgs args = SomeArgs.obtain();
+ args.arg1 = inputId;
+ args.arg2 = deviceInfo;
+ obj = args;
break;
}
}
- Message msg = mHandler.obtainMessage(messageType, 0, 0, deviceInfo);
+ Message msg = mHandler.obtainMessage(messageType, 0, 0, obj);
if (findHardwareInfoForHdmiPortLocked(deviceInfo.getPortId()) != null) {
msg.sendToTarget();
} else {
@@ -994,6 +1003,15 @@
}
}
}
+
+ private HdmiDeviceInfo findHdmiDeviceInfo(int id) {
+ for (HdmiDeviceInfo info : mHdmiDeviceList) {
+ if (info.getId() == id) {
+ return info;
+ }
+ }
+ return null;
+ }
}
private final class HdmiSystemAudioModeChangeListener extends
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index dc5bc84..a084cab 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -17,6 +17,7 @@
package com.android.server.tv;
import static android.media.tv.TvInputManager.INPUT_STATE_CONNECTED;
+import static android.media.tv.TvInputManager.INPUT_STATE_CONNECTED_STANDBY;
import static android.media.tv.TvInputManager.INPUT_STATE_DISCONNECTED;
import android.app.ActivityManager;
@@ -36,6 +37,7 @@
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.graphics.Rect;
+import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.media.tv.ITvInputClient;
import android.media.tv.ITvInputHardware;
@@ -212,8 +214,6 @@
private void buildTvInputListLocked(int userId) {
UserState userState = getUserStateLocked(userId);
-
- Map<String, TvInputState> inputMap = new HashMap<String, TvInputState>();
userState.packageSet.clear();
if (DEBUG) Slog.d(TAG, "buildTvInputList");
@@ -229,41 +229,42 @@
+ android.Manifest.permission.BIND_TV_INPUT);
continue;
}
- try {
- inputList.clear();
- ComponentName component = new ComponentName(si.packageName, si.name);
- if (hasHardwarePermission(pm, component)) {
- ServiceState serviceState = userState.serviceStateMap.get(component);
- if (serviceState == null) {
- // We see this hardware TV input service for the first time; we need to
- // prepare the ServiceState object so that we can connect to the service and
- // let it add TvInputInfo objects to mInputList if there's any.
- serviceState = new ServiceState(component, userId);
- userState.serviceStateMap.put(component, serviceState);
- } else {
- inputList.addAll(serviceState.mInputList);
- }
+
+ ComponentName component = new ComponentName(si.packageName, si.name);
+ if (hasHardwarePermission(pm, component)) {
+ ServiceState serviceState = userState.serviceStateMap.get(component);
+ if (serviceState == null) {
+ // We see this hardware TV input service for the first time; we need to
+ // prepare the ServiceState object so that we can connect to the service and
+ // let it add TvInputInfo objects to mInputList if there's any.
+ serviceState = new ServiceState(component, userId);
+ userState.serviceStateMap.put(component, serviceState);
} else {
+ inputList.addAll(serviceState.mInputList);
+ }
+ } else {
+ try {
inputList.add(TvInputInfo.createTvInputInfo(mContext, ri));
+ } catch (XmlPullParserException | IOException e) {
+ Slog.e(TAG, "Failed to load TV input " + si.name, e);
+ continue;
}
-
- for (TvInputInfo info : inputList) {
- if (DEBUG) Slog.d(TAG, "add " + info.getId());
- TvInputState state = userState.inputMap.get(info.getId());
- if (state == null) {
- state = new TvInputState();
- }
- state.mInfo = info;
- inputMap.put(info.getId(), state);
- }
-
- // Reconnect the service if existing input is updated.
- updateServiceConnectionLocked(component, userId);
-
- userState.packageSet.add(si.packageName);
- } catch (IOException | XmlPullParserException e) {
- Slog.e(TAG, "Can't load TV input " + si.name, e);
}
+
+ // Reconnect the service if existing input is updated.
+ updateServiceConnectionLocked(component, userId);
+ userState.packageSet.add(si.packageName);
+ }
+
+ Map<String, TvInputState> inputMap = new HashMap<String, TvInputState>();
+ for (TvInputInfo info : inputList) {
+ if (DEBUG) Slog.d(TAG, "add " + info.getId());
+ TvInputState state = userState.inputMap.get(info.getId());
+ if (state == null) {
+ state = new TvInputState();
+ }
+ state.mInfo = info;
+ inputMap.put(info.getId(), state);
}
for (String inputId : inputMap.keySet()) {
@@ -338,7 +339,6 @@
Slog.e(TAG, "error in unregisterCallback", e);
}
}
- serviceState.mClientTokens.clear();
mContext.unbindService(serviceState.mConnection);
}
userState.serviceStateMap.clear();
@@ -401,9 +401,7 @@
}
private static boolean shouldMaintainConnection(ServiceState serviceState) {
- return !serviceState.mClientTokens.isEmpty()
- || !serviceState.mSessionTokens.isEmpty()
- || serviceState.mIsHardware;
+ return !serviceState.mSessionTokens.isEmpty() || serviceState.mIsHardware;
// TODO: Find a way to maintain connection only when necessary.
}
@@ -693,6 +691,10 @@
private void releaseSessionLocked(IBinder sessionToken, int callingUid, int userId) {
SessionState sessionState = getSessionStateLocked(sessionToken, callingUid, userId);
if (sessionState.mSession != null) {
+ UserState userState = getUserStateLocked(userId);
+ if (sessionToken == userState.mainSessionToken) {
+ setMainLocked(sessionToken, false, callingUid, userId);
+ }
try {
sessionState.mSession.release();
} catch (RemoteException e) {
@@ -706,6 +708,9 @@
private void removeSessionStateLocked(IBinder sessionToken, int userId) {
UserState userState = getUserStateLocked(userId);
if (sessionToken == userState.mainSessionToken) {
+ if (DEBUG) {
+ Slog.d(TAG, "mainSessionToken=null");
+ }
userState.mainSessionToken = null;
}
@@ -742,6 +747,25 @@
mWatchLogHandler.obtainMessage(WatchLogHandler.MSG_LOG_WATCH_END, args).sendToTarget();
}
+ private void setMainLocked(IBinder sessionToken, boolean isMain, int callingUid, int userId) {
+ SessionState sessionState = getSessionStateLocked(sessionToken, callingUid, userId);
+ if (sessionState.mHardwareSessionToken != null) {
+ sessionState = getSessionStateLocked(sessionState.mHardwareSessionToken,
+ Process.SYSTEM_UID, userId);
+ }
+ ServiceState serviceState = getServiceStateLocked(sessionState.mInfo.getComponent(),
+ userId);
+ if (!serviceState.mIsHardware) {
+ return;
+ }
+ ITvInputSession session = getSessionLocked(sessionState);
+ try {
+ session.setMain(isMain);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "error in setMain", e);
+ }
+ }
+
private void notifyInputAddedLocked(UserState userState, String inputId) {
if (DEBUG) {
Slog.d(TAG, "notifyInputAdded: inputId = " + inputId);
@@ -996,12 +1020,13 @@
}
private void ensureParentalControlsPermission() {
- if (mContext.checkCallingPermission(
- android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException(
- "The caller does not have parental controls permission");
- }
+ // STOPSHIP: Uncomment when b/16984416 is resolved.
+ //if (mContext.checkCallingPermission(
+ // android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
+ // != PackageManager.PERMISSION_GRANTED) {
+ // throw new SecurityException(
+ // "The caller does not have parental controls permission");
+ //}
}
@Override
@@ -1051,6 +1076,9 @@
@Override
public void releaseSession(IBinder sessionToken, int userId) {
+ if (DEBUG) {
+ Slog.d(TAG, "releaseSession(): " + sessionToken);
+ }
final int callingUid = Binder.getCallingUid();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
userId, "releaseSession");
@@ -1066,6 +1094,9 @@
@Override
public void setMainSession(IBinder sessionToken, int userId) {
+ if (DEBUG) {
+ Slog.d(TAG, "setMainSession(): " + sessionToken);
+ }
final int callingUid = Binder.getCallingUid();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
userId, "setMainSession");
@@ -1076,50 +1107,19 @@
if (userState.mainSessionToken == sessionToken) {
return;
}
-
- SessionState newMainSessionState = getSessionStateLocked(
- sessionToken, callingUid, resolvedUserId);
- if (newMainSessionState.mHardwareSessionToken != null) {
- newMainSessionState = getSessionStateLocked(
- newMainSessionState.mHardwareSessionToken,
- Process.SYSTEM_UID, resolvedUserId);
+ if (DEBUG) {
+ Slog.d(TAG, "mainSessionToken=" + sessionToken);
}
- ServiceState newMainServiceState = getServiceStateLocked(
- newMainSessionState.mInfo.getComponent(), resolvedUserId);
- ITvInputSession newMainSession = getSessionLocked(newMainSessionState);
-
- ServiceState oldMainServiceState = null;
- ITvInputSession oldMainSession = null;
- if (userState.mainSessionToken != null) {
- SessionState oldMainSessionState = getSessionStateLocked(
- userState.mainSessionToken, Process.SYSTEM_UID, resolvedUserId);
- if (oldMainSessionState.mHardwareSessionToken != null) {
- oldMainSessionState = getSessionStateLocked(
- oldMainSessionState.mHardwareSessionToken,
- Process.SYSTEM_UID, resolvedUserId);
- }
- oldMainServiceState = getServiceStateLocked(
- oldMainSessionState.mInfo.getComponent(), resolvedUserId);
- oldMainSession = getSessionLocked(oldMainSessionState);
- }
-
+ IBinder oldMainSessionToken = userState.mainSessionToken;
userState.mainSessionToken = sessionToken;
// Inform the new main session first.
- // See {@link TvInputService#onSetMainSession}.
- if (newMainServiceState.mIsHardware) {
- try {
- newMainSession.setMainSession(true);
- } catch (RemoteException e) {
- Slog.e(TAG, "error in setMainSession", e);
- }
+ // See {@link TvInputService.Session#onSetMain}.
+ if (sessionToken != null) {
+ setMainLocked(sessionToken, true, callingUid, userId);
}
- if (oldMainSession != null && oldMainServiceState.mIsHardware) {
- try {
- oldMainSession.setMainSession(false);
- } catch (RemoteException e) {
- Slog.e(TAG, "error in setMainSession", e);
- }
+ if (oldMainSessionToken != null) {
+ setMainLocked(oldMainSessionToken, false, Process.SYSTEM_UID, userId);
}
}
} finally {
@@ -1224,7 +1224,7 @@
try {
getSessionLocked(sessionToken, callingUid, resolvedUserId).tune(
channelUri, params);
- if (TvContract.isChannelUriForPassthroughTvInput(channelUri)) {
+ if (TvContract.isChannelUriForPassthroughInput(channelUri)) {
// Do not log the watch history for passthrough inputs.
return;
}
@@ -1610,13 +1610,6 @@
pw.increaseIndent();
- pw.println("mClientTokens:");
- pw.increaseIndent();
- for (IBinder token : service.mClientTokens) {
- pw.println("" + token);
- }
- pw.decreaseIndent();
-
pw.println("mSessionTokens:");
pw.increaseIndent();
for (IBinder token : service.mSessionTokens) {
@@ -1753,7 +1746,6 @@
}
private final class ServiceState {
- private final List<IBinder> mClientTokens = new ArrayList<IBinder>();
private final List<IBinder> mSessionTokens = new ArrayList<IBinder>();
private final ServiceConnection mConnection;
private final ComponentName mComponent;
@@ -1808,12 +1800,9 @@
// If there are any other sessions based on this session, they should be released.
UserState userState = getUserStateLocked(mUserId);
for (SessionState sessionState : userState.sessionStateMap.values()) {
- if (mSession != null && mSession == sessionState.mHardwareSessionToken) {
- try {
- sessionState.mSession.release();
- } catch (RemoteException e) {
- Slog.e(TAG, "error in release", e);
- }
+ if (mSessionToken == sessionState.mHardwareSessionToken) {
+ releaseSessionLocked(sessionState.mSessionToken, Process.SYSTEM_UID,
+ mUserId);
try {
sessionState.mClient.onSessionReleased(sessionState.mSeq);
} catch (RemoteException e) {
@@ -1971,11 +1960,11 @@
}
@Override
- public void addHdmiTvInput(int logicalAddress, TvInputInfo inputInfo) {
+ public void addHdmiTvInput(int id, TvInputInfo inputInfo) {
ensureHardwarePermission();
ensureValidInput(inputInfo);
synchronized (mLock) {
- mTvInputHardwareManager.addHdmiTvInput(logicalAddress, inputInfo);
+ mTvInputHardwareManager.addHdmiTvInput(id, inputInfo);
addTvInputLocked(inputInfo);
}
}
@@ -2176,8 +2165,27 @@
}
@Override
- public void onHdmiDeviceUpdated(HdmiDeviceInfo deviceInfo) {
- // TODO: implement here.
+ public void onHdmiDeviceUpdated(String inputId, HdmiDeviceInfo deviceInfo) {
+ synchronized (mLock) {
+ Integer state = null;
+ switch (deviceInfo.getDevicePowerStatus()) {
+ case HdmiControlManager.POWER_STATUS_ON:
+ state = INPUT_STATE_CONNECTED;
+ break;
+ case HdmiControlManager.POWER_STATUS_STANDBY:
+ case HdmiControlManager.POWER_STATUS_TRANSIENT_TO_ON:
+ case HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY:
+ state = INPUT_STATE_CONNECTED_STANDBY;
+ break;
+ case HdmiControlManager.POWER_STATUS_UNKNOWN:
+ default:
+ state = null;
+ break;
+ }
+ if (state != null) {
+ setStateLocked(inputId, state.intValue(), mCurrentUserId);
+ }
+ }
}
}
}
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 0e1340c..f6ec86d 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -159,7 +159,7 @@
private final int mConfigShortAnimTime;
private final Interpolator mDecelerateInterpolator;
private final Interpolator mThumbnailFadeoutInterpolator;
- private final Interpolator mThumbnailCubicInterpolator;
+ private final Interpolator mThumbnailFastOutSlowInInterpolator;
private int mCurrentUserId = 0;
@@ -170,7 +170,7 @@
com.android.internal.R.integer.config_shortAnimTime);
mDecelerateInterpolator = AnimationUtils.loadInterpolator(context,
com.android.internal.R.interpolator.decelerate_cubic);
- mThumbnailCubicInterpolator = AnimationUtils.loadInterpolator(context,
+ mThumbnailFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
com.android.internal.R.interpolator.fast_out_slow_in);
mThumbnailFadeoutInterpolator = new Interpolator() {
@Override
@@ -635,7 +635,7 @@
}
return prepareThumbnailAnimationWithDuration(a, appWidth, appHeight,
- THUMBNAIL_APP_TRANSITION_DURATION, mThumbnailCubicInterpolator);
+ THUMBNAIL_APP_TRANSITION_DURATION, mThumbnailFastOutSlowInInterpolator);
}
/**
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 3fcd067..b2575e6 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -252,6 +252,15 @@
return false;
}
+ void removeAllWindows() {
+ for (int winNdx = allAppWindows.size() - 1; winNdx >= 0; --winNdx) {
+ WindowState win = allAppWindows.get(winNdx);
+ if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) Slog.w(WindowManagerService.TAG,
+ "removeAllWindows: removing win=" + win);
+ win.mService.removeWindowLocked(win.mSession, win);
+ }
+ }
+
@Override
void dump(PrintWriter pw, String prefix) {
super.dump(pw, prefix);
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index dfb1200..238c77e 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -155,7 +155,7 @@
final ArrayList<WindowState> windows = activities.get(activityNdx).allAppWindows;
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowStateAnimator winAnimator = windows.get(winNdx).mWinAnimator;
- if (winAnimator.isAnimating() && !winAnimator.isDummyAnimation()) {
+ if (winAnimator.isAnimating() || winAnimator.mWin.mExiting) {
return true;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 32e8afe..4edd5cf 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -88,6 +88,8 @@
boolean mInitialized = false;
boolean mKeyguardGoingAway;
+ boolean mKeyguardGoingAwayToNotificationShade;
+ boolean mKeyguardGoingAwayDisableWindowAnimations;
// forceHiding states.
static final int KEYGUARD_NOT_SHOWN = 0;
@@ -389,7 +391,11 @@
if (unForceHiding != null) {
boolean startKeyguardExit = true;
for (int i=unForceHiding.size()-1; i>=0; i--) {
- Animation a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding);
+ Animation a = null;
+ if (!mKeyguardGoingAwayDisableWindowAnimations) {
+ a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding,
+ mKeyguardGoingAwayToNotificationShade);
+ }
if (a != null) {
final WindowStateAnimator winAnimator = unForceHiding.get(i);
winAnimator.setAnimation(a);
@@ -405,9 +411,14 @@
}
// Wallpaper is going away in un-force-hide motion, animate it as well.
- if (!wallpaperInUnForceHiding && wallpaper != null) {
- WindowStateAnimator animator = wallpaper.mWinAnimator;
- animator.setAnimation(mPolicy.createForceHideWallpaperExitAnimation());
+ if (!wallpaperInUnForceHiding && wallpaper != null
+ && !mKeyguardGoingAwayDisableWindowAnimations) {
+ Animation a = mPolicy.createForceHideWallpaperExitAnimation(
+ mKeyguardGoingAwayToNotificationShade);
+ if (a != null) {
+ WindowStateAnimator animator = wallpaper.mWinAnimator;
+ animator.setAnimation(a);
+ }
}
}
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index e7ebae7..b57a090 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -51,6 +51,7 @@
import android.app.admin.DevicePolicyManager;
import android.animation.ValueAnimator;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -58,6 +59,7 @@
import android.content.pm.PackageManager;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
+import android.database.ContentObserver;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
@@ -428,7 +430,7 @@
/**
* Stores for each user whether screencapture is disabled
* This array is essentially a cache for all userId for
- * {@link android.app.admin.DevicePolicyManager#getScreenCaptureDisabled(null, userId)}
+ * {@link android.app.admin.DevicePolicyManager#getScreenCaptureDisabled}
*/
SparseArray<Boolean> mScreenCaptureDisabled = new SparseArray<Boolean>();
@@ -462,6 +464,9 @@
int mRotation = 0;
int mForcedAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
boolean mAltOrientation = false;
+
+ private boolean mKeyguardWaitingForActivityDrawn;
+
class RotationWatcher {
IRotationWatcher watcher;
IBinder.DeathRecipient deathRecipient;
@@ -534,8 +539,23 @@
final ArrayList<WindowState> mInputMethodDialogs = new ArrayList<WindowState>();
boolean mHardKeyboardAvailable;
- boolean mHardKeyboardEnabled;
+ boolean mShowImeWithHardKeyboard;
OnHardKeyboardStatusChangeListener mHardKeyboardStatusChangeListener;
+ SettingsObserver mSettingsObserver;
+
+ private final class SettingsObserver extends ContentObserver {
+ public SettingsObserver() {
+ super(new Handler());
+ ContentResolver resolver = mContext.getContentResolver();
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ updateShowImeWithHardKeyboard();
+ }
+ }
final ArrayList<WindowToken> mWallpaperTokens = new ArrayList<WindowToken>();
@@ -835,6 +855,9 @@
filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
mContext.registerReceiver(mBroadcastReceiver, filter);
+ mSettingsObserver = new SettingsObserver();
+ updateShowImeWithHardKeyboard();
+
mHoldingScreenWakeLock = mPowerManager.newWakeLock(
PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE, TAG);
mHoldingScreenWakeLock.setReferenceCounted(false);
@@ -2311,6 +2334,13 @@
+ attrs.token + ". Aborting.");
return WindowManagerGlobal.ADD_BAD_APP_TOKEN;
}
+ } else if (token.appWindowToken != null) {
+ Slog.w(TAG, "Non-null appWindowToken for system window of type=" + type);
+ // It is not valid to use an app token with other system types; we will
+ // instead make a new token for it (as if null had been passed in for the token).
+ attrs.token = null;
+ token = new WindowToken(this, null, -1, false);
+ addToken = true;
}
win = new WindowState(this, session, client, token,
@@ -3585,7 +3615,7 @@
return;
}
final Task oldTask = mTaskIdToTask.get(atoken.groupId);
- removeAppFromTaskLocked(atoken);
+ oldTask.removeAppToken(atoken);
atoken.groupId = groupId;
Task newTask = mTaskIdToTask.get(groupId);
@@ -4627,6 +4657,8 @@
}
void removeAppFromTaskLocked(AppWindowToken wtoken) {
+ wtoken.removeAllWindows();
+
final Task task = mTaskIdToTask.get(wtoken.groupId);
if (task != null) {
if (!task.removeAppToken(wtoken)) {
@@ -5236,17 +5268,35 @@
}
@Override
- public void keyguardGoingAway() {
+ public void keyguardGoingAway(boolean disableWindowAnimations,
+ boolean keyguardGoingToNotificationShade) {
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires DISABLE_KEYGUARD permission");
}
synchronized (mWindowMap) {
mAnimator.mKeyguardGoingAway = true;
+ mAnimator.mKeyguardGoingAwayToNotificationShade = keyguardGoingToNotificationShade;
+ mAnimator.mKeyguardGoingAwayDisableWindowAnimations = disableWindowAnimations;
requestTraversalLocked();
}
}
+ public void keyguardWaitingForActivityDrawn() {
+ synchronized (mWindowMap) {
+ mKeyguardWaitingForActivityDrawn = true;
+ }
+ }
+
+ public void notifyActivityDrawnForKeyguard() {
+ synchronized (mWindowMap) {
+ if (mKeyguardWaitingForActivityDrawn) {
+ mPolicy.notifyActivityDrawnForKeyguardLw();
+ mKeyguardWaitingForActivityDrawn = false;
+ }
+ }
+ }
+
void showGlobalActions() {
mPolicy.showGlobalActions();
}
@@ -6988,11 +7038,10 @@
boolean hardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS;
if (hardKeyboardAvailable != mHardKeyboardAvailable) {
mHardKeyboardAvailable = hardKeyboardAvailable;
- mHardKeyboardEnabled = hardKeyboardAvailable;
mH.removeMessages(H.REPORT_HARD_KEYBOARD_STATUS_CHANGE);
mH.sendEmptyMessage(H.REPORT_HARD_KEYBOARD_STATUS_CHANGE);
}
- if (!mHardKeyboardEnabled) {
+ if (mShowImeWithHardKeyboard) {
config.keyboard = Configuration.KEYBOARD_NOKEYS;
}
@@ -7012,18 +7061,12 @@
}
}
- public boolean isHardKeyboardEnabled() {
+ public void updateShowImeWithHardKeyboard() {
+ boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
+ mCurrentUserId) == 1;
synchronized (mWindowMap) {
- return mHardKeyboardEnabled;
- }
- }
-
- public void setHardKeyboardEnabled(boolean enabled) {
- synchronized (mWindowMap) {
- if (mHardKeyboardEnabled != enabled) {
- mHardKeyboardEnabled = enabled;
- mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
- }
+ mShowImeWithHardKeyboard = showImeWithHardKeyboard;
}
}
@@ -7035,15 +7078,14 @@
}
void notifyHardKeyboardStatusChange() {
- final boolean available, enabled;
+ final boolean available;
final OnHardKeyboardStatusChangeListener listener;
synchronized (mWindowMap) {
listener = mHardKeyboardStatusChangeListener;
available = mHardKeyboardAvailable;
- enabled = mHardKeyboardEnabled;
}
if (listener != null) {
- listener.onHardKeyboardStatusChange(available, enabled);
+ listener.onHardKeyboardStatusChange(available);
}
}
@@ -11026,7 +11068,7 @@
}
public interface OnHardKeyboardStatusChangeListener {
- public void onHardKeyboardStatusChange(boolean available, boolean enabled);
+ public void onHardKeyboardStatusChange(boolean available);
}
void debugLayoutRepeats(final String msg, int pendingLayoutChanges) {
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 61c50d67..7bf090a 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1211,6 +1211,12 @@
|| w.mDecorFrame.isEmpty()) {
// The universe background isn't cropped, nor windows without policy decor.
w.mSystemDecorRect.set(0, 0, w.mCompatFrame.width(), w.mCompatFrame.height());
+ } else if (w.mAttrs.type == LayoutParams.TYPE_WALLPAPER && mAnimator.mAnimating) {
+ // If we're animating, the wallpaper crop should only be updated at the end of the
+ // animation.
+ mTmpClipRect.set(w.mSystemDecorRect);
+ applyDecorRect(w.mDecorFrame);
+ w.mSystemDecorRect.union(mTmpClipRect);
} else {
// Crop to the system decor specified by policy.
applyDecorRect(w.mDecorFrame);
diff --git a/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp b/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp
index 2519ff8..37a3eaa 100644
--- a/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp
+++ b/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp
@@ -66,7 +66,12 @@
}
ALOGE("Error %d in '%s'", resultCode, methodName);
- env->FatalError(methodName);
+ // TODO: this layer needs to be refactored to return error codes to Java
+ // raising a FatalError is harsh, and because FLP Hardware Provider is loaded inside the system
+ // service, it can cause the device to reboot, or remain in a reboot loop
+ // a simple exception is still dumped to logcat, but it is handled more gracefully
+ jclass exceptionClass = env->FindClass("java/lang/RuntimeException");
+ env->ThrowNew(exceptionClass, methodName);
}
static bool IsValidCallbackThread() {
diff --git a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp b/services/core/jni/com_android_server_location_GpsLocationProvider.cpp
index 46327d7..c398908 100644
--- a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GpsLocationProvider.cpp
@@ -28,6 +28,7 @@
#include "android_runtime/AndroidRuntime.h"
#include "android_runtime/Log.h"
+#include <arpa/inet.h>
#include <string.h>
#include <pthread.h>
#include <linux/in.h>
@@ -189,8 +190,10 @@
jbyte ipv4[4];
if (net_order) {
+ ALOGV("Converting IPv4 address(net_order) %x", ip);
memcpy(ipv4, &ip, sizeof(ipv4));
} else {
+ ALOGV("Converting IPv4 address(host_order) %x", ip);
//endianess transparent conversion from int to char[]
ipv4[0] = (jbyte) (ip & 0xFF);
ipv4[1] = (jbyte)((ip>>8) & 0xFF);
@@ -210,6 +213,7 @@
size_t status_size = agps_status->size;
if (status_size == sizeof(AGpsStatus_v3)) {
+ ALOGV("AGpsStatus is V3: %d", status_size);
switch (agps_status->addr.ss_family)
{
case AF_INET:
@@ -220,6 +224,12 @@
if (byteArray != NULL) {
isSupported = true;
}
+ IF_ALOGD() {
+ // log the IP for reference in case there is a bogus value pushed by HAL
+ char str[INET_ADDRSTRLEN];
+ inet_ntop(AF_INET, &(in->sin_addr), str, INET_ADDRSTRLEN);
+ ALOGD("AGPS IP is v4: %s", str);
+ }
}
break;
case AF_INET6:
@@ -232,6 +242,12 @@
} else {
ALOGE("Unable to allocate byte array for IPv6 address.");
}
+ IF_ALOGD() {
+ // log the IP for reference in case there is a bogus value pushed by HAL
+ char str[INET6_ADDRSTRLEN];
+ inet_ntop(AF_INET6, &(in6->sin6_addr), str, INET6_ADDRSTRLEN);
+ ALOGD("AGPS IP is v6: %s", str);
+ }
}
break;
default:
@@ -239,14 +255,17 @@
break;
}
} else if (status_size >= sizeof(AGpsStatus_v2)) {
+ ALOGV("AGpsStatus is V2+: %d", status_size);
// for back-compatibility reasons we check in v2 that the data structure size is greater or
// equal to the declared size in gps.h
uint32_t ipaddr = agps_status->ipaddr;
+ ALOGV("AGPS IP is v4: %x", ipaddr);
byteArray = convert_to_ipv4(ipaddr, false /* net_order */);
if (ipaddr == INADDR_NONE || byteArray != NULL) {
isSupported = true;
}
} else if (status_size >= sizeof(AGpsStatus_v1)) {
+ ALOGV("AGpsStatus is V1+: %d", status_size);
// because we have to check for >= with regards to v2, we also need to relax the check here
// and only make sure that the size is at least what we expect
isSupported = true;
@@ -255,6 +274,8 @@
}
if (isSupported) {
+ jsize byteArrayLength = byteArray != NULL ? env->GetArrayLength(byteArray) : 0;
+ ALOGV("Passing AGPS IP addr: size %d", byteArrayLength);
env->CallVoidMethod(mCallbacksObj, method_reportAGpsStatus, agps_status->type,
agps_status->status, byteArray);
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index ce2ca9b..39b70a8 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -41,6 +41,8 @@
int register_android_server_hdmi_HdmiMhlController(JNIEnv* env);
int register_android_server_tv_TvInputHal(JNIEnv* env);
int register_android_server_PersistentDataBlockService(JNIEnv* env);
+int register_android_server_fingerprint_FingerprintService(JNIEnv* env);
+int register_android_server_Watchdog(JNIEnv* env);
};
using namespace android;
@@ -77,6 +79,8 @@
register_android_server_hdmi_HdmiMhlController(env);
register_android_server_tv_TvInputHal(env);
register_android_server_PersistentDataBlockService(env);
+ register_android_server_fingerprint_FingerprintService(env);
+ register_android_server_Watchdog(env);
return JNI_VERSION_1_4;
}
diff --git a/services/devicepolicy/Android.mk b/services/devicepolicy/Android.mk
index a55d138..7020f17 100644
--- a/services/devicepolicy/Android.mk
+++ b/services/devicepolicy/Android.mk
@@ -7,6 +7,6 @@
LOCAL_SRC_FILES += \
$(call all-java-files-under,java)
-LOCAL_JAVA_LIBRARIES := conscrypt
+LOCAL_JAVA_LIBRARIES := conscrypt services.core
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index fc96991..02f8bd5 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -18,17 +18,6 @@
import static android.Manifest.permission.MANAGE_CA_CERTIFICATES;
-import android.app.admin.DevicePolicyManagerInternal;
-import com.android.internal.R;
-import com.android.internal.os.storage.ExternalStorageFormatter;
-import com.android.internal.util.FastXmlSerializer;
-import com.android.internal.util.JournaledFile;
-import com.android.internal.util.XmlUtils;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.org.conscrypt.TrustedCertificateStore;
-import com.android.server.LocalServices;
-import com.android.server.SystemService;
-
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlarmManager;
@@ -40,6 +29,7 @@
import android.app.admin.DeviceAdminInfo;
import android.app.admin.DeviceAdminReceiver;
import android.app.admin.DevicePolicyManager;
+import android.app.admin.DevicePolicyManagerInternal;
import android.app.admin.IDevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -58,6 +48,7 @@
import android.net.Uri;
import android.content.pm.PackageManager.NameNotFoundException;
import android.database.ContentObserver;
+import android.hardware.usb.UsbManager;
import android.net.ProxyInfo;
import android.os.Binder;
import android.os.Bundle;
@@ -88,6 +79,16 @@
import android.util.Xml;
import android.view.IWindowManager;
+import com.android.internal.R;
+import com.android.internal.os.storage.ExternalStorageFormatter;
+import com.android.internal.util.FastXmlSerializer;
+import com.android.internal.util.JournaledFile;
+import com.android.internal.util.XmlUtils;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.org.conscrypt.TrustedCertificateStore;
+import com.android.server.LocalServices;
+import com.android.server.SystemService;
+
import org.xmlpull.v1.XmlPullParser;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
@@ -145,6 +146,21 @@
private static final String ATTR_PERMISSION_PROVIDER = "permission-provider";
private static final String ATTR_SETUP_COMPLETE = "setup-complete";
+ private static final Set<String> DEVICE_OWNER_USER_RESTRICTIONS;
+ static {
+ DEVICE_OWNER_USER_RESTRICTIONS = new HashSet();
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_USB_FILE_TRANSFER);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_TETHERING);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FACTORY_RESET);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_ADD_USER);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_UNMUTE_MICROPHONE);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_ADJUST_VOLUME);
+ DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SMS);
+ }
+
final Context mContext;
final UserManager mUserManager;
final PowerManager.WakeLock mWakeLock;
@@ -1515,6 +1531,8 @@
.setContentIntent(notifyIntent)
.setPriority(Notification.PRIORITY_HIGH)
.setShowWhen(false)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color))
.build();
// If this is a boot intent, this will fire for each user. But if this is a storage changed
@@ -3417,8 +3435,7 @@
synchronized (this) {
long ident = Binder.clearCallingIdentity();
try {
- mUserManager.setUserRestrictions(new Bundle(),
- new UserHandle(UserHandle.USER_OWNER));
+ clearUserRestrictions(new UserHandle(UserHandle.USER_OWNER));
if (mDeviceOwner != null) {
mDeviceOwner.clearDeviceOwner();
mDeviceOwner.writeOwnerFile();
@@ -3481,7 +3498,7 @@
synchronized (this) {
long ident = Binder.clearCallingIdentity();
try {
- mUserManager.setUserRestrictions(new Bundle(), callingUser);
+ clearUserRestrictions(callingUser);
if (mDeviceOwner != null) {
mDeviceOwner.removeProfileOwner(callingUser.getIdentifier());
mDeviceOwner.writeOwnerFile();
@@ -3492,6 +3509,19 @@
}
}
+ private void clearUserRestrictions(UserHandle userHandle) {
+ AudioManager audioManager =
+ (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+ Bundle userRestrictions = mUserManager.getUserRestrictions();
+ mUserManager.setUserRestrictions(new Bundle(), userHandle);
+ if (userRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)) {
+ audioManager.setMasterMute(false);
+ }
+ if (userRestrictions.getBoolean(UserManager.DISALLOW_UNMUTE_MICROPHONE)) {
+ audioManager.setMicrophoneMute(false);
+ }
+ }
+
@Override
public boolean hasUserSetupCompleted() {
if (!mHasFeature) {
@@ -4030,11 +4060,66 @@
if (who == null) {
throw new NullPointerException("ComponentName is null");
}
- getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ ActiveAdmin activeAdmin =
+ getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ boolean isDeviceOwner = isDeviceOwner(activeAdmin.info.getPackageName());
+ if (!isDeviceOwner && DEVICE_OWNER_USER_RESTRICTIONS.contains(key)) {
+ throw new SecurityException("Profile owners cannot set user restriction " + key);
+ }
long id = Binder.clearCallingIdentity();
try {
+ AudioManager audioManager =
+ (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+ boolean alreadyRestricted = mUserManager.hasUserRestriction(key);
+
+ if (enabled && !alreadyRestricted) {
+ if (UserManager.DISALLOW_CONFIG_WIFI.equals(key)) {
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0,
+ userHandle.getIdentifier());
+ } else if (UserManager.DISALLOW_USB_FILE_TRANSFER.equals(key)) {
+ UsbManager manager =
+ (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
+ manager.setCurrentFunction("none", false);
+ } else if (UserManager.DISALLOW_SHARE_LOCATION.equals(key)) {
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF,
+ userHandle.getIdentifier());
+ Settings.Secure.putStringForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "",
+ userHandle.getIdentifier());
+ } else if (UserManager.DISALLOW_DEBUGGING_FEATURES.equals(key)) {
+ Settings.Global.putStringForUser(mContext.getContentResolver(),
+ Settings.Global.ADB_ENABLED, "0", userHandle.getIdentifier());
+ } else if (UserManager.ENSURE_VERIFY_APPS.equals(key)) {
+ Settings.Global.putStringForUser(mContext.getContentResolver(),
+ Settings.Global.PACKAGE_VERIFIER_ENABLE, "1",
+ userHandle.getIdentifier());
+ Settings.Global.putStringForUser(mContext.getContentResolver(),
+ Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, "1",
+ userHandle.getIdentifier());
+ } else if (UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES.equals(key)) {
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.INSTALL_NON_MARKET_APPS, 0,
+ userHandle.getIdentifier());
+ } else if (UserManager.DISALLOW_UNMUTE_MICROPHONE.equals(key)) {
+ audioManager.setMicrophoneMute(true);
+ } else if (UserManager.DISALLOW_ADJUST_VOLUME.equals(key)) {
+ audioManager.setMasterMute(true);
+ }
+ }
+
mUserManager.setUserRestriction(key, enabled, userHandle);
+
+ if (!enabled && alreadyRestricted) {
+ if (UserManager.DISALLOW_UNMUTE_MICROPHONE.equals(key)) {
+ audioManager.setMicrophoneMute(false);
+ } else if (UserManager.DISALLOW_ADJUST_VOLUME.equals(key)) {
+ audioManager.setMasterMute(false);
+ }
+ }
+
} finally {
restoreCallingIdentity(id);
}
@@ -4378,44 +4463,39 @@
* This function can only be called by the device owner.
* @param components The list of components allowed to enter lock task mode.
*/
- public void setLockTaskPackages(String[] packages) throws SecurityException {
- // Get the package names of the caller.
- int uid = Binder.getCallingUid();
- String[] packageNames = mContext.getPackageManager().getPackagesForUid(uid);
-
+ public void setLockTaskPackages(ComponentName who, String[] packages) throws SecurityException {
synchronized (this) {
- // Check whether any of the package name is the device owner.
- for (int i=0; i<packageNames.length; i++) {
- String packageName = packageNames[i];
- int userHandle = UserHandle.getUserId(uid);
- if (isDeviceOwner(packageName)) {
+ if (who == null) {
+ throw new NullPointerException("ComponentName is null");
+ }
+ getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
- // If a package name is the device owner,
- // we update the component list.
- DevicePolicyData policy = getUserData(userHandle);
- policy.mLockTaskPackages.clear();
- if (packages != null) {
- for (int j = 0; j < packages.length; j++) {
- String pkg = packages[j];
- policy.mLockTaskPackages.add(pkg);
- }
- }
-
- // Store the settings persistently.
- saveSettingsLocked(userHandle);
- return;
+ int userHandle = Binder.getCallingUserHandle().getIdentifier();
+ DevicePolicyData policy = getUserData(userHandle);
+ policy.mLockTaskPackages.clear();
+ if (packages != null) {
+ for (int j = 0; j < packages.length; j++) {
+ String pkg = packages[j];
+ policy.mLockTaskPackages.add(pkg);
}
}
+
+ // Store the settings persistently.
+ saveSettingsLocked(userHandle);
}
- throw new SecurityException();
}
/**
* This function returns the list of components allowed to start the task lock mode.
*/
- public String[] getLockTaskPackages() {
+ public String[] getLockTaskPackages(ComponentName who) {
synchronized (this) {
- int userHandle = UserHandle.USER_OWNER;
+ if (who == null) {
+ throw new NullPointerException("ComponentName is null");
+ }
+ getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+
+ int userHandle = Binder.getCallingUserHandle().getIdentifier();
DevicePolicyData policy = getUserData(userHandle);
return policy.mLockTaskPackages.toArray(new String[0]);
}
@@ -4453,15 +4533,18 @@
synchronized (this) {
final DevicePolicyData policy = getUserData(userHandle);
Bundle adminExtras = new Bundle();
- adminExtras.putBoolean(DeviceAdminReceiver.EXTRA_LOCK_TASK_ENTERING, isEnabled);
adminExtras.putString(DeviceAdminReceiver.EXTRA_LOCK_TASK_PACKAGE, pkg);
for (ActiveAdmin admin : policy.mAdminList) {
boolean ownsDevice = isDeviceOwner(admin.info.getPackageName());
boolean ownsProfile = (getProfileOwner(userHandle) != null
&& getProfileOwner(userHandle).equals(admin.info.getPackageName()));
if (ownsDevice || ownsProfile) {
- sendAdminCommandLocked(admin, DeviceAdminReceiver.ACTION_LOCK_TASK_CHANGED,
- adminExtras, null);
+ if (isEnabled) {
+ sendAdminCommandLocked(admin, DeviceAdminReceiver.ACTION_LOCK_TASK_ENTERING,
+ adminExtras, null);
+ } else {
+ sendAdminCommandLocked(admin, DeviceAdminReceiver.ACTION_LOCK_TASK_EXITING);
+ }
}
}
}
diff --git a/services/print/Android.mk b/services/print/Android.mk
index 33604b7..00eb2e4 100644
--- a/services/print/Android.mk
+++ b/services/print/Android.mk
@@ -7,4 +7,6 @@
LOCAL_SRC_FILES += \
$(call all-java-files-under,java)
+LOCAL_JAVA_LIBRARIES := services.core
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
index 7400dde..6a56de0 100644
--- a/services/print/java/com/android/server/print/PrintManagerService.java
+++ b/services/print/java/com/android/server/print/PrintManagerService.java
@@ -783,7 +783,9 @@
.setContentIntent(pendingIntent)
.setWhen(System.currentTimeMillis())
.setAutoCancel(true)
- .setShowWhen(true);
+ .setShowWhen(true)
+ .setColor(mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color));
NotificationManager notificationManager = (NotificationManager) mContext
.getSystemService(Context.NOTIFICATION_SERVICE);
diff --git a/services/restrictions/Android.mk b/services/restrictions/Android.mk
index fcf8626..57d1c46 100644
--- a/services/restrictions/Android.mk
+++ b/services/restrictions/Android.mk
@@ -7,4 +7,6 @@
LOCAL_SRC_FILES += \
$(call all-java-files-under,java)
+LOCAL_JAVA_LIBRARIES := services.core
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
index 8aae695..c3d4ed9 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
@@ -47,7 +47,6 @@
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.app.IAlarmManager;
import android.app.PendingIntent;
@@ -880,7 +879,8 @@
expectLastCall().anyTimes();
mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), anyLong(),
- isA(PendingIntent.class), isA(WorkSource.class), isA(AlarmClockInfo.class));
+ isA(PendingIntent.class), isA(WorkSource.class),
+ isA(AlarmManager.AlarmClockInfo.class));
expectLastCall().atLeastOnce();
mNetManager.setGlobalAlert(anyLong());
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 2e309be..6e13732 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -47,6 +47,18 @@
}
}
}, filter);
+
+ removeExistingUsers();
+ }
+
+ private void removeExistingUsers() {
+ List<UserInfo> list = mUserManager.getUsers();
+ boolean found = false;
+ for (UserInfo user : list) {
+ if (user.id != UserHandle.USER_OWNER) {
+ removeUser(user.id);
+ }
+ }
}
public void testHasPrimary() throws Exception {
@@ -95,6 +107,29 @@
assertFalse(findUser(userInfo.id));
}
+ public void testAddGuest() throws Exception {
+ UserInfo userInfo1 = mUserManager.createUser("Guest 1", UserInfo.FLAG_GUEST);
+ UserInfo userInfo2 = mUserManager.createUser("Guest 2", UserInfo.FLAG_GUEST);
+ assertNotNull(userInfo1);
+ assertNull(userInfo2);
+
+ // Cleanup
+ removeUser(userInfo1.id);
+ }
+
+ // Make sure only one managed profile can be created
+ public void testAddManagedProfile() throws Exception {
+ UserInfo userInfo1 = mUserManager.createProfileForUser("Managed 1",
+ UserInfo.FLAG_MANAGED_PROFILE, UserHandle.USER_OWNER);
+ UserInfo userInfo2 = mUserManager.createProfileForUser("Managed 2",
+ UserInfo.FLAG_MANAGED_PROFILE, UserHandle.USER_OWNER);
+ assertNotNull(userInfo1);
+ assertNull(userInfo2);
+
+ // Cleanup
+ removeUser(userInfo1.id);
+ }
+
private boolean findUser(int id) {
List<UserInfo> list = mUserManager.getUsers();
diff --git a/services/usage/Android.mk b/services/usage/Android.mk
index d4b7fa8..f1cbe98 100644
--- a/services/usage/Android.mk
+++ b/services/usage/Android.mk
@@ -7,4 +7,6 @@
LOCAL_SRC_FILES += \
$(call all-java-files-under,java)
+LOCAL_JAVA_LIBRARIES := services.core
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index c0923ca..c078cb2 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -732,6 +732,8 @@
"com.android.settings.UsbSettings"));
PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0,
intent, 0, null, UserHandle.CURRENT);
+ notification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(mContext, title, message, pi);
notification.visibility = Notification.VISIBILITY_PUBLIC;
mNotificationManager.notifyAsUser(null, id, notification,
@@ -768,6 +770,8 @@
"com.android.settings.DevelopmentSettings"));
PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0,
intent, 0, null, UserHandle.CURRENT);
+ notification.color = mContext.getResources().getColor(
+ com.android.internal.R.color.system_notification_accent_color);
notification.setLatestEventInfo(mContext, title, message, pi);
notification.visibility = Notification.VISIBILITY_PUBLIC;
mAdbNotificationShown = true;
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java
index bcbae60..5860fc7 100644
--- a/services/usb/java/com/android/server/usb/UsbHostManager.java
+++ b/services/usb/java/com/android/server/usb/UsbHostManager.java
@@ -314,14 +314,22 @@
mConnectedUsbCard = cardsParser.getNumCardRecords() - 1;
mConnectedUsbDeviceNum = 0;
- if (!waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, false)) {
- return;
- }
-
mConnectedHasPlayback = devicesParser.hasPlaybackDevices(mConnectedUsbCard);
mConnectedHasCapture = devicesParser.hasCaptureDevices(mConnectedUsbCard);
mConnectedHasMIDI = devicesParser.hasMIDIDevices(mConnectedUsbCard);
+ // Playback device file needed/present?
+ if (mConnectedHasPlayback &&
+ !waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, false)) {
+ return;
+ }
+
+ // Capture device file needed/present?
+ if (mConnectedHasCapture &&
+ !waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, true)) {
+ return;
+ }
+
if (DEBUG_AUDIO) {
Slog.d(TAG,
"usb: hasPlayback:" + mConnectedHasPlayback + " hasCapture:" + mConnectedHasCapture);
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/DatabaseHelper.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/DatabaseHelper.java
index f0ecafe..cc0d8df 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/DatabaseHelper.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/DatabaseHelper.java
@@ -130,8 +130,8 @@
synchronized(this) {
SQLiteDatabase db = getWritableDatabase();
- String soundModelClause = SoundModelContract.KEY_MODEL_UUID + "="
- + modelUuid.toString();
+ String soundModelClause = SoundModelContract.KEY_MODEL_UUID + "='"
+ + modelUuid.toString() + "'";
try {
return db.delete(SoundModelContract.TABLE, soundModelClause, null) != 0;
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index cd3684b..a173a5c 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -132,14 +132,33 @@
public void initForUser(int userHandle) {
if (DEBUG) Slog.i(TAG, "initForUser user=" + userHandle);
- ComponentName curInteractor = getCurInteractor(userHandle);
+ String curInteractorStr = Settings.Secure.getStringForUser(
+ mContext.getContentResolver(),
+ Settings.Secure.VOICE_INTERACTION_SERVICE, userHandle);
ComponentName curRecognizer = getCurRecognizer(userHandle);
+ VoiceInteractionServiceInfo curInteractorInfo = null;
+ if (curInteractorStr == null && curRecognizer != null) {
+ // If there is no interactor setting, that means we are upgrading
+ // from an older platform version. If the current recognizer is not
+ // set or matches the preferred recognizer, then we want to upgrade
+ // the user to have the default voice interaction service enabled.
+ curInteractorInfo = findAvailInteractor(userHandle, curRecognizer);
+ if (curInteractorInfo != null) {
+ // Looks good! We'll apply this one. To make it happen, we clear the
+ // recognizer so that we don't think we have anything set and will
+ // re-apply the settings.
+ curRecognizer = null;
+ }
+ }
+
if (curRecognizer != null) {
// If we already have at least a recognizer, then we probably want to
// leave things as they are... unless something has disappeared.
IPackageManager pm = AppGlobals.getPackageManager();
ServiceInfo interactorInfo = null;
ServiceInfo recognizerInfo = null;
+ ComponentName curInteractor = !TextUtils.isEmpty(curInteractorStr)
+ ? ComponentName.unflattenFromString(curInteractorStr) : null;
try {
recognizerInfo = pm.getServiceInfo(curRecognizer, 0, userHandle);
if (curInteractor != null) {
@@ -154,32 +173,27 @@
}
// Initializing settings, look for an interactor first.
- curInteractor = findAvailInteractor(userHandle);
- if (curInteractor != null) {
- try {
- VoiceInteractionServiceInfo info = new VoiceInteractionServiceInfo(
- mContext.getPackageManager(), curInteractor, userHandle);
- if (info.getParseError() == null) {
- setCurInteractor(curInteractor, userHandle);
- if (info.getRecognitionService() != null) {
- // Eventually it will be an error to not specify this.
- curRecognizer = new ComponentName(info.getServiceInfo().packageName,
- info.getRecognitionService());
- setCurRecognizer(curRecognizer, userHandle);
- return;
- }
- } else {
- Slog.w(TAG, "Bad interaction service " + curInteractor + ": "
- + info.getParseError());
- }
- } catch (PackageManager.NameNotFoundException e) {
- } catch (RemoteException e) {
+ if (curInteractorInfo == null) {
+ curInteractorInfo = findAvailInteractor(userHandle, null);
+ }
+ if (curInteractorInfo != null) {
+ // Eventually it will be an error to not specify this.
+ setCurInteractor(new ComponentName(curInteractorInfo.getServiceInfo().packageName,
+ curInteractorInfo.getServiceInfo().name), userHandle);
+ if (curInteractorInfo.getRecognitionService() != null) {
+ setCurRecognizer(
+ new ComponentName(curInteractorInfo.getServiceInfo().packageName,
+ curInteractorInfo.getRecognitionService()), userHandle);
+ return;
}
}
// No voice interactor, we'll just set up a simple recognizer.
curRecognizer = findAvailRecognizer(null, userHandle);
if (curRecognizer != null) {
+ if (curInteractorInfo == null) {
+ setCurInteractor(null, userHandle);
+ }
setCurRecognizer(curRecognizer, userHandle);
}
}
@@ -234,7 +248,7 @@
}
}
- ComponentName findAvailInteractor(int userHandle) {
+ VoiceInteractionServiceInfo findAvailInteractor(int userHandle, ComponentName recognizer) {
List<ResolveInfo> available =
mContext.getPackageManager().queryIntentServicesAsUser(
new Intent(VoiceInteractionService.SERVICE_INTERFACE), 0, userHandle);
@@ -246,23 +260,41 @@
} else {
// Find first system package. We never want to allow third party services to
// be automatically selected, because those require approval of the user.
- ServiceInfo serviceInfo = null;
+ VoiceInteractionServiceInfo foundInfo = null;
for (int i=0; i<numAvailable; i++) {
ServiceInfo cur = available.get(i).serviceInfo;
if ((cur.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0) {
- if (serviceInfo == null) {
- serviceInfo = cur;
- } else {
- Slog.w(TAG, "more than one voice interaction service, picking first "
- + new ComponentName(serviceInfo.packageName, serviceInfo.name)
- + " over "
- + new ComponentName(cur.packageName, cur.name));
+ ComponentName comp = new ComponentName(cur.packageName, cur.name);
+ try {
+ VoiceInteractionServiceInfo info = new VoiceInteractionServiceInfo(
+ mContext.getPackageManager(), comp, userHandle);
+ if (info.getParseError() == null) {
+ if (recognizer == null || info.getServiceInfo().packageName.equals(
+ recognizer.getPackageName())) {
+ if (foundInfo == null) {
+ foundInfo = info;
+ } else {
+ Slog.w(TAG, "More than one voice interaction service, "
+ + "picking first "
+ + new ComponentName(
+ foundInfo.getServiceInfo().packageName,
+ foundInfo.getServiceInfo().name)
+ + " over "
+ + new ComponentName(cur.packageName, cur.name));
+ }
+ }
+ } else {
+ Slog.w(TAG, "Bad interaction service " + comp + ": "
+ + info.getParseError());
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ Slog.w(TAG, "Failure looking up interaction service " + comp);
+ } catch (RemoteException e) {
}
}
}
- return serviceInfo != null ?
- new ComponentName(serviceInfo.packageName, serviceInfo.name) : null;
+ return foundInfo;
}
}
diff --git a/telecomm/java/android/telecomm/CallAudioState.aidl b/telecomm/java/android/telecomm/AudioState.aidl
similarity index 93%
copy from telecomm/java/android/telecomm/CallAudioState.aidl
copy to telecomm/java/android/telecomm/AudioState.aidl
index ae64567..03772b6 100644
--- a/telecomm/java/android/telecomm/CallAudioState.aidl
+++ b/telecomm/java/android/telecomm/AudioState.aidl
@@ -16,4 +16,7 @@
package android.telecomm;
-parcelable CallAudioState;
+/**
+ * {@hide}
+ */
+parcelable AudioState;
diff --git a/telecomm/java/android/telecomm/CallAudioState.java b/telecomm/java/android/telecomm/AudioState.java
similarity index 82%
rename from telecomm/java/android/telecomm/CallAudioState.java
rename to telecomm/java/android/telecomm/AudioState.java
index d9a0090..491af14 100644
--- a/telecomm/java/android/telecomm/CallAudioState.java
+++ b/telecomm/java/android/telecomm/AudioState.java
@@ -24,7 +24,7 @@
/**
* Encapsulates all audio states during a call.
*/
-public final class CallAudioState implements Parcelable {
+public final class AudioState implements Parcelable {
/** Direct the audio stream through the device's earpiece. */
public static int ROUTE_EARPIECE = 0x00000001;
@@ -56,15 +56,13 @@
/** Bit vector of all routes supported by this call. */
public final int supportedRouteMask;
- /** @hide */
- public CallAudioState(boolean isMuted, int route, int supportedRouteMask) {
+ public AudioState(boolean isMuted, int route, int supportedRouteMask) {
this.isMuted = isMuted;
this.route = route;
this.supportedRouteMask = supportedRouteMask;
}
- /** @hide */
- public CallAudioState(CallAudioState state) {
+ public AudioState(AudioState state) {
isMuted = state.isMuted;
route = state.route;
supportedRouteMask = state.supportedRouteMask;
@@ -75,10 +73,10 @@
if (obj == null) {
return false;
}
- if (!(obj instanceof CallAudioState)) {
+ if (!(obj instanceof AudioState)) {
return false;
}
- CallAudioState state = (CallAudioState) obj;
+ AudioState state = (AudioState) obj;
return isMuted == state.isMuted && route == state.route &&
supportedRouteMask == state.supportedRouteMask;
}
@@ -86,7 +84,7 @@
@Override
public String toString() {
return String.format(Locale.US,
- "[CallAudioState isMuted: %b, route; %s, supportedRouteMask: %s]",
+ "[AudioState isMuted: %b, route; %s, supportedRouteMask: %s]",
isMuted, audioRouteToString(route), audioRouteToString(supportedRouteMask));
}
@@ -121,22 +119,22 @@
}
/**
- * Responsible for creating CallAudioState objects for deserialized Parcels.
+ * Responsible for creating AudioState objects for deserialized Parcels.
*/
- public static final Parcelable.Creator<CallAudioState> CREATOR =
- new Parcelable.Creator<CallAudioState> () {
+ public static final Parcelable.Creator<AudioState> CREATOR =
+ new Parcelable.Creator<AudioState> () {
@Override
- public CallAudioState createFromParcel(Parcel source) {
+ public AudioState createFromParcel(Parcel source) {
boolean isMuted = source.readByte() == 0 ? false : true;
int route = source.readInt();
int supportedRouteMask = source.readInt();
- return new CallAudioState(isMuted, route, supportedRouteMask);
+ return new AudioState(isMuted, route, supportedRouteMask);
}
@Override
- public CallAudioState[] newArray(int size) {
- return new CallAudioState[size];
+ public AudioState[] newArray(int size) {
+ return new AudioState[size];
}
};
@@ -149,7 +147,7 @@
}
/**
- * Writes CallAudioState object into a serializeable Parcel.
+ * Writes AudioState object into a serializeable Parcel.
*/
@Override
public void writeToParcel(Parcel destination, int flags) {
diff --git a/telecomm/java/android/telecomm/Call.java b/telecomm/java/android/telecomm/Call.java
index 0a54c71..63f85e9 100644
--- a/telecomm/java/android/telecomm/Call.java
+++ b/telecomm/java/android/telecomm/Call.java
@@ -16,8 +16,10 @@
package android.telecomm;
+import android.annotation.SystemApi;
import android.app.PendingIntent;
import android.net.Uri;
+import android.os.Bundle;
import android.telephony.DisconnectCause;
import java.lang.String;
@@ -26,10 +28,14 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Represents an ongoing phone call that the in-call app should present to the user.
+ *
+ * {@hide}
*/
+@SystemApi
public final class Call {
/**
* The state of a {@code Call} when newly created.
@@ -84,11 +90,12 @@
private final PhoneAccountHandle mAccountHandle;
private final int mCallCapabilities;
private final int mDisconnectCauseCode;
- private final String mDisconnectCauseMsg;
+ private final String mDisconnectCauseMessage;
private final long mConnectTimeMillis;
private final GatewayInfo mGatewayInfo;
private final int mVideoState;
private final StatusHints mStatusHints;
+ private final Bundle mExtras;
/**
* @return The handle (e.g., phone number) to which the {@code Call} is currently
@@ -100,7 +107,7 @@
/**
* @return The presentation requirements for the handle. See
- * {@link android.telecomm.CallPropertyPresentation} for valid values.
+ * {@link PropertyPresentation} for valid values.
*/
public int getHandlePresentation() {
return mHandlePresentation;
@@ -115,7 +122,7 @@
/**
* @return The presentation requirements for the caller display name. See
- * {@link android.telecomm.CallPropertyPresentation} for valid values.
+ * {@link PropertyPresentation} for valid values.
*/
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
@@ -131,7 +138,7 @@
/**
* @return A bitmask of the capabilities of the {@code Call}, as defined in
- * {@link CallCapabilities}.
+ * {@link PhoneCapabilities}.
*/
public int getCallCapabilities() {
return mCallCapabilities;
@@ -149,8 +156,8 @@
* @return For a {@link #STATE_DISCONNECTED} {@code Call}, an optional reason for
* disconnection expressed as a free text message.
*/
- public String getDisconnectCauseMsg() {
- return mDisconnectCauseMsg;
+ public String getDisconnectCauseMessage() {
+ return mDisconnectCauseMessage;
}
/**
@@ -184,6 +191,13 @@
return mStatusHints;
}
+ /**
+ * @return A bundle extras to pass with the call
+ */
+ public Bundle getExtras() {
+ return mExtras;
+ }
+
@Override
public boolean equals(Object o) {
if (o instanceof Details) {
@@ -197,11 +211,12 @@
Objects.equals(mAccountHandle, d.mAccountHandle) &&
Objects.equals(mCallCapabilities, d.mCallCapabilities) &&
Objects.equals(mDisconnectCauseCode, d.mDisconnectCauseCode) &&
- Objects.equals(mDisconnectCauseMsg, d.mDisconnectCauseMsg) &&
+ Objects.equals(mDisconnectCauseMessage, d.mDisconnectCauseMessage) &&
Objects.equals(mConnectTimeMillis, d.mConnectTimeMillis) &&
Objects.equals(mGatewayInfo, d.mGatewayInfo) &&
Objects.equals(mVideoState, d.mVideoState) &&
- Objects.equals(mStatusHints, d.mStatusHints);
+ Objects.equals(mStatusHints, d.mStatusHints) &&
+ Objects.equals(mExtras, d.mExtras);
}
return false;
}
@@ -216,11 +231,12 @@
Objects.hashCode(mAccountHandle) +
Objects.hashCode(mCallCapabilities) +
Objects.hashCode(mDisconnectCauseCode) +
- Objects.hashCode(mDisconnectCauseMsg) +
+ Objects.hashCode(mDisconnectCauseMessage) +
Objects.hashCode(mConnectTimeMillis) +
Objects.hashCode(mGatewayInfo) +
Objects.hashCode(mVideoState) +
- Objects.hashCode(mStatusHints);
+ Objects.hashCode(mStatusHints) +
+ Objects.hashCode(mExtras);
}
/** {@hide} */
@@ -232,11 +248,12 @@
PhoneAccountHandle accountHandle,
int capabilities,
int disconnectCauseCode,
- String disconnectCauseMsg,
+ String disconnectCauseMessage,
long connectTimeMillis,
GatewayInfo gatewayInfo,
int videoState,
- StatusHints statusHints) {
+ StatusHints statusHints,
+ Bundle extras) {
mHandle = handle;
mHandlePresentation = handlePresentation;
mCallerDisplayName = callerDisplayName;
@@ -244,11 +261,12 @@
mAccountHandle = accountHandle;
mCallCapabilities = capabilities;
mDisconnectCauseCode = disconnectCauseCode;
- mDisconnectCauseMsg = disconnectCauseMsg;
+ mDisconnectCauseMessage = disconnectCauseMessage;
mConnectTimeMillis = connectTimeMillis;
mGatewayInfo = gatewayInfo;
mVideoState = videoState;
mStatusHints = statusHints;
+ mExtras = extras;
}
}
@@ -256,8 +274,6 @@
/**
* Invoked when the state of this {@code Call} has changed. See {@link #getState()}.
*
- * TODO: Provide previous state also?
- *
* @param call The {@code Call} invoking this method.
* @param state The new state of the {@code Call}.
*/
@@ -349,14 +365,16 @@
private final Phone mPhone;
private final String mTelecommCallId;
private final InCallAdapter mInCallAdapter;
+ private final List<String> mChildrenIds = new ArrayList<>();
private final List<Call> mChildren = new ArrayList<>();
private final List<Call> mUnmodifiableChildren = Collections.unmodifiableList(mChildren);
- private final List<Listener> mListeners = new ArrayList<>();
+ private final List<Listener> mListeners = new CopyOnWriteArrayList<>();
private final List<Call> mConferenceableCalls = new ArrayList<>();
private final List<Call> mUnmodifiableConferenceableCalls =
Collections.unmodifiableList(mConferenceableCalls);
- private Call mParent = null;
+ private boolean mChildrenCached;
+ private String mParentId = null;
private int mState;
private List<String> mCannedTextResponses = null;
private String mRemainingPostDialSequence;
@@ -459,8 +477,6 @@
/**
* Notifies this {@code Call} that the phone account user interface element was touched.
- *
- * TODO: Figure out if and how we can generalize this
*/
public void phoneAccountClicked() {
mInCallAdapter.phoneAccountClicked(mTelecommCallId);
@@ -495,21 +511,16 @@
}
/**
- * Instructs this {@code Call} to swap itself with an existing background call, if one
- * such call exists.
- */
- public void swapWithBackgroundCall() {
- mInCallAdapter.swapWithBackgroundCall(mTelecommCallId);
- }
-
- /**
* Obtains the parent of this {@code Call} in a conference, if any.
*
* @return The parent {@code Call}, or {@code null} if this {@code Call} is not a
* child of any conference {@code Call}s.
*/
public Call getParent() {
- return mParent;
+ if (mParentId != null) {
+ return mPhone.internalGetCallByTelecommId(mParentId);
+ }
+ return null;
}
/**
@@ -519,6 +530,21 @@
* {@code List} otherwise.
*/
public List<Call> getChildren() {
+ if (!mChildrenCached) {
+ mChildrenCached = true;
+ mChildren.clear();
+
+ for(String id : mChildrenIds) {
+ Call call = mPhone.internalGetCallByTelecommId(id);
+ if (call == null) {
+ // At least one child was still not found, so do not save true for "cached"
+ mChildrenCached = false;
+ } else {
+ mChildren.add(call);
+ }
+ }
+ }
+
return mUnmodifiableChildren;
}
@@ -586,7 +612,9 @@
* @param listener A {@code Listener}.
*/
public void removeListener(Listener listener) {
- mListeners.remove(listener);
+ if (listener != null) {
+ mListeners.remove(listener);
+ }
}
/** {@hide} */
@@ -617,7 +645,8 @@
parcelableCall.getConnectTimeMillis(),
parcelableCall.getGatewayInfo(),
parcelableCall.getVideoState(),
- parcelableCall.getStatusHints());
+ parcelableCall.getStatusHints(),
+ parcelableCall.getExtras());
boolean detailsChanged = !Objects.equals(mDetails, details);
if (detailsChanged) {
mDetails = details;
@@ -641,16 +670,18 @@
mState = state;
}
- if (parcelableCall.getParentCallId() != null) {
- mParent = mPhone.internalGetCallByTelecommId(parcelableCall.getParentCallId());
+ String parentId = parcelableCall.getParentCallId();
+ boolean parentChanged = !Objects.equals(mParentId, parentId);
+ if (parentChanged) {
+ mParentId = parentId;
}
- mChildren.clear();
- if (parcelableCall.getChildCallIds() != null) {
- for (int i = 0; i < parcelableCall.getChildCallIds().size(); i++) {
- mChildren.add(mPhone.internalGetCallByTelecommId(
- parcelableCall.getChildCallIds().get(i)));
- }
+ List<String> childCallIds = parcelableCall.getChildCallIds();
+ boolean childrenChanged = !Objects.equals(childCallIds, mChildrenIds);
+ if (childrenChanged) {
+ mChildrenIds.clear();
+ mChildrenIds.addAll(parcelableCall.getChildCallIds());
+ mChildrenCached = false;
}
List<String> conferenceableCallIds = parcelableCall.getConferenceableCallIds();
@@ -682,6 +713,12 @@
if (videoCallChanged) {
fireVideoCallChanged(mVideoCall);
}
+ if (parentChanged) {
+ fireParentChanged(getParent());
+ }
+ if (childrenChanged) {
+ fireChildrenChanged(getChildren());
+ }
// If we have transitioned to DISCONNECTED, that means we need to notify clients and
// remove ourselves from the Phone. Note that we do this after completing all state updates
@@ -705,94 +742,84 @@
}
private void fireStateChanged(int newState) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onStateChanged(this, newState);
+ for (Listener listener : mListeners) {
+ listener.onStateChanged(this, newState);
}
}
private void fireParentChanged(Call newParent) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onParentChanged(this, newParent);
+ for (Listener listener : mListeners) {
+ listener.onParentChanged(this, newParent);
}
}
private void fireChildrenChanged(List<Call> children) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onChildrenChanged(this, children);
+ for (Listener listener : mListeners) {
+ listener.onChildrenChanged(this, children);
}
}
private void fireDetailsChanged(Details details) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onDetailsChanged(this, details);
+ for (Listener listener : mListeners) {
+ listener.onDetailsChanged(this, details);
}
}
private void fireCannedTextResponsesLoaded(List<String> cannedTextResponses) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onCannedTextResponsesLoaded(this, cannedTextResponses);
+ for (Listener listener : mListeners) {
+ listener.onCannedTextResponsesLoaded(this, cannedTextResponses);
}
}
private void fireVideoCallChanged(InCallService.VideoCall videoCall) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onVideoCallChanged(this, videoCall);
+ for (Listener listener : mListeners) {
+ listener.onVideoCallChanged(this, videoCall);
}
}
private void firePostDialWait(String remainingPostDialSequence) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onPostDialWait(this, remainingPostDialSequence);
+ for (Listener listener : mListeners) {
+ listener.onPostDialWait(this, remainingPostDialSequence);
}
}
private void fireStartActivity(PendingIntent intent) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onStartActivity(this, intent);
+ for (Listener listener : mListeners) {
+ listener.onStartActivity(this, intent);
}
}
private void fireCallDestroyed() {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onCallDestroyed(this);
+ for (Listener listener : mListeners) {
+ listener.onCallDestroyed(this);
}
}
private void fireConferenceableCallsChanged() {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onConferenceableCallsChanged(this, mUnmodifiableConferenceableCalls);
+ for (Listener listener : mListeners) {
+ listener.onConferenceableCallsChanged(this, mUnmodifiableConferenceableCalls);
}
}
- private int stateFromParcelableCallState(CallState parcelableCallState) {
+ private int stateFromParcelableCallState(int parcelableCallState) {
switch (parcelableCallState) {
- case NEW:
+ case CallState.NEW:
return STATE_NEW;
- case CONNECTING:
+ case CallState.CONNECTING:
return STATE_CONNECTING;
- case PRE_DIAL_WAIT:
+ case CallState.PRE_DIAL_WAIT:
return STATE_PRE_DIAL_WAIT;
- case DIALING:
+ case CallState.DIALING:
return STATE_DIALING;
- case RINGING:
+ case CallState.RINGING:
return STATE_RINGING;
- case ACTIVE:
+ case CallState.ACTIVE:
return STATE_ACTIVE;
- case ON_HOLD:
+ case CallState.ON_HOLD:
return STATE_HOLDING;
- case DISCONNECTED:
+ case CallState.DISCONNECTED:
return STATE_DISCONNECTED;
- case ABORTED:
+ case CallState.ABORTED:
return STATE_DISCONNECTED;
default:
Log.wtf(this, "Unrecognized CallState %s", parcelableCallState);
diff --git a/telecomm/java/android/telecomm/CallState.java b/telecomm/java/android/telecomm/CallState.java
index 0ca4840..0770e26 100644
--- a/telecomm/java/android/telecomm/CallState.java
+++ b/telecomm/java/android/telecomm/CallState.java
@@ -16,27 +16,35 @@
package android.telecomm;
+import android.annotation.SystemApi;
+
/**
* Defines call-state constants of the different states in which a call can exist. Although states
* have the notion of normal transitions, due to the volatile nature of telephony systems, code
* that uses these states should be resilient to unexpected state changes outside of what is
* considered traditional.
+ *
+ * {@hide}
*/
-public enum CallState {
+@SystemApi
+public final class CallState {
+
+ private CallState() {}
+
/**
* Indicates that a call is new and not connected. This is used as the default state internally
* within Telecomm and should not be used between Telecomm and call services. Call services are
* not expected to ever interact with NEW calls, but {@link InCallService}s will see calls in
* this state.
*/
- NEW,
+ public static final int NEW = 0;
/**
* The initial state of an outgoing {@code Call}.
* Common transitions are to {@link #DIALING} state for a successful call or
* {@link #DISCONNECTED} if it failed.
*/
- CONNECTING,
+ public static final int CONNECTING = 1;
/**
* Indicates that the call is about to go into the outgoing and dialing state but is waiting for
@@ -44,7 +52,7 @@
* this is the state where the InCallUI is waiting for the user to select a
* {@link PhoneAccount} to call from.
*/
- PRE_DIAL_WAIT,
+ public static final int PRE_DIAL_WAIT = 2;
/**
* Indicates that a call is outgoing and in the dialing state. A call transitions to this state
@@ -52,7 +60,7 @@
* state usually transition to {@link #ACTIVE} if the call was answered or {@link #DISCONNECTED}
* if the call was disconnected somehow (e.g., failure or cancellation of the call by the user).
*/
- DIALING,
+ public static final int DIALING = 3;
/**
* Indicates that a call is incoming and the user still has the option of answering, rejecting,
@@ -60,14 +68,14 @@
* ringtone. Normal transitions are to {@link #ACTIVE} if answered or {@link #DISCONNECTED}
* otherwise.
*/
- RINGING,
+ public static final int RINGING = 4;
/**
* Indicates that a call is currently connected to another party and a communication channel is
* open between them. The normal transition to this state is by the user answering a
* {@link #DIALING} call or a {@link #RINGING} call being answered by the other party.
*/
- ACTIVE,
+ public static final int ACTIVE = 5;
/**
* Indicates that the call is currently on hold. In this state, the call is not terminated
@@ -75,7 +83,7 @@
* to this state is by the user putting an {@link #ACTIVE} call on hold by explicitly performing
* an action, such as clicking the hold button.
*/
- ON_HOLD,
+ public static final int ON_HOLD = 6;
/**
* Indicates that a call is currently disconnected. All states can transition to this state
@@ -84,12 +92,36 @@
* the disconnection or communication was lost to the call service currently responsible for
* this call (e.g., call service crashes).
*/
- DISCONNECTED,
+ public static final int DISCONNECTED = 7;
/**
* Indicates that the call was attempted (mostly in the context of outgoing, at least at the
* time of writing) but cancelled before it was successfully connected.
- * @hide
*/
- ABORTED;
+ public static final int ABORTED = 8;
+
+ public static String toString(int callState) {
+ switch (callState) {
+ case NEW:
+ return "NEW";
+ case CONNECTING:
+ return "CONNECTING";
+ case PRE_DIAL_WAIT:
+ return "PRE_DIAL_WAIT";
+ case DIALING:
+ return "DIALING";
+ case RINGING:
+ return "RINGING";
+ case ACTIVE:
+ return "ACTIVE";
+ case ON_HOLD:
+ return "ON_HOLD";
+ case DISCONNECTED:
+ return "DISCONNECTED";
+ case ABORTED:
+ return "ABORTED";
+ default:
+ return "UNKNOWN";
+ }
+ }
}
diff --git a/telecomm/java/android/telecomm/CallCameraCapabilities.aidl b/telecomm/java/android/telecomm/CameraCapabilities.aidl
similarity index 92%
copy from telecomm/java/android/telecomm/CallCameraCapabilities.aidl
copy to telecomm/java/android/telecomm/CameraCapabilities.aidl
index 25b6106..08e6f43 100644
--- a/telecomm/java/android/telecomm/CallCameraCapabilities.aidl
+++ b/telecomm/java/android/telecomm/CameraCapabilities.aidl
@@ -14,7 +14,9 @@
* limitations under the License
*/
-
package android.telecomm;
-parcelable CallCameraCapabilities;
+/**
+ * {@hide}
+ */
+parcelable CameraCapabilities;
diff --git a/telecomm/java/android/telecomm/CallCameraCapabilities.java b/telecomm/java/android/telecomm/CameraCapabilities.java
similarity index 84%
rename from telecomm/java/android/telecomm/CallCameraCapabilities.java
rename to telecomm/java/android/telecomm/CameraCapabilities.java
index 74904e3..7c7dde1 100644
--- a/telecomm/java/android/telecomm/CallCameraCapabilities.java
+++ b/telecomm/java/android/telecomm/CameraCapabilities.java
@@ -21,9 +21,8 @@
/**
* Represents the camera capabilities important to a Video Telephony provider.
- * TODO: Add camera capabilities as required.
*/
-public final class CallCameraCapabilities implements Parcelable {
+public final class CameraCapabilities implements Parcelable {
/**
* Whether the camera supports zoom.
@@ -53,7 +52,7 @@
* @param width The width of the camera video (in pixels).
* @param height The height of the camera video (in pixels).
*/
- public CallCameraCapabilities(boolean zoomSupported, float maxZoom, int width, int height) {
+ public CameraCapabilities(boolean zoomSupported, float maxZoom, int width, int height) {
mZoomSupported = zoomSupported;
mMaxZoom = maxZoom;
mWidth = width;
@@ -63,8 +62,8 @@
/**
* Responsible for creating CallCameraCapabilities objects from deserialized Parcels.
**/
- public static final Parcelable.Creator<CallCameraCapabilities> CREATOR =
- new Parcelable.Creator<CallCameraCapabilities> () {
+ public static final Parcelable.Creator<CameraCapabilities> CREATOR =
+ new Parcelable.Creator<CameraCapabilities> () {
/**
* Creates a CallCameraCapabilities instances from a parcel.
*
@@ -72,18 +71,18 @@
* @return The CallCameraCapabilities.
*/
@Override
- public CallCameraCapabilities createFromParcel(Parcel source) {
+ public CameraCapabilities createFromParcel(Parcel source) {
boolean supportsZoom = source.readByte() != 0;
float maxZoom = source.readFloat();
int width = source.readInt();
int height = source.readInt();
- return new CallCameraCapabilities(supportsZoom, maxZoom, width, height);
+ return new CameraCapabilities(supportsZoom, maxZoom, width, height);
}
@Override
- public CallCameraCapabilities[] newArray(int size) {
- return new CallCameraCapabilities[size];
+ public CameraCapabilities[] newArray(int size) {
+ return new CameraCapabilities[size];
}
};
diff --git a/telecomm/java/android/telecomm/Conference.java b/telecomm/java/android/telecomm/Conference.java
new file mode 100644
index 0000000..34b9dae
--- /dev/null
+++ b/telecomm/java/android/telecomm/Conference.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.telecomm;
+
+import android.telephony.DisconnectCause;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * Represents a conference call which can contain any number of {@link Connection} objects.
+ */
+public abstract class Conference {
+
+ /** @hide */
+ public abstract static class Listener {
+ public void onStateChanged(Conference conference, int oldState, int newState) {}
+ public void onDisconnected(Conference conference, int cause, String message) {}
+ public void onConnectionAdded(Conference conference, Connection connection) {}
+ public void onConnectionRemoved(Conference conference, Connection connection) {}
+ public void onDestroyed(Conference conference) {}
+ public void onCapabilitiesChanged(Conference conference, int capabilities) {}
+ }
+
+ private final Set<Listener> mListeners = new CopyOnWriteArraySet<>();
+ private final List<Connection> mChildConnections = new CopyOnWriteArrayList<>();
+ private final List<Connection> mUnmodifiableChildConnection =
+ Collections.unmodifiableList(mChildConnections);
+
+ private PhoneAccountHandle mPhoneAccount;
+ private int mState = Connection.STATE_NEW;
+ private int mDisconnectCause = DisconnectCause.NOT_VALID;
+ private int mCapabilities;
+ private String mDisconnectMessage;
+
+ public Conference(PhoneAccountHandle phoneAccount) {
+ mPhoneAccount = phoneAccount;
+ }
+
+ public final PhoneAccountHandle getPhoneAccount() {
+ return mPhoneAccount;
+ }
+
+ public final List<Connection> getConnections() {
+ return mUnmodifiableChildConnection;
+ }
+
+ public final int getState() {
+ return mState;
+ }
+
+ public final int getCapabilities() {
+ return mCapabilities;
+ }
+
+ /**
+ * Invoked when the Conference and all it's {@link Connection}s should be disconnected.
+ */
+ public void onDisconnect() {}
+
+ /**
+ * Invoked when the specified {@link Connection} should be separated from the conference call.
+ *
+ * @param connection The connection to separate.
+ */
+ public void onSeparate(Connection connection) {}
+
+ /**
+ * Invoked when the conference should be put on hold.
+ */
+ public void onHold() {}
+
+ /**
+ * Invoked when the conference should be moved from hold to active.
+ */
+ public void onUnhold() {}
+
+ /**
+ * Sets state to be on hold.
+ */
+ public final void setOnHold() {
+ setState(Connection.STATE_HOLDING);
+ }
+
+ /**
+ * Sets state to be active.
+ */
+ public final void setActive() {
+ setState(Connection.STATE_ACTIVE);
+ }
+
+ /**
+ * Sets state to disconnected.
+ *
+ * @param cause The reason for the disconnection, any of
+ * {@link android.telephony.DisconnectCause}.
+ * @param message Optional call-service-provided message about the disconnect.
+ */
+ public final void setDisconnected(int cause, String message) {
+ mDisconnectCause = cause;
+ mDisconnectMessage = message;
+ setState(Connection.STATE_DISCONNECTED);
+ for (Listener l : mListeners) {
+ l.onDisconnected(this, mDisconnectCause, mDisconnectMessage);
+ }
+ }
+
+ /**
+ * Sets the cabilities of a conference.
+ */
+ public final void setCapabilities(int capabilities) {
+ if (capabilities != mCapabilities) {
+ mCapabilities = capabilities;
+
+ for (Listener l : mListeners) {
+ l.onCapabilitiesChanged(this, mCapabilities);
+ }
+ }
+ }
+
+ /**
+ * Adds the specified connection as a child of this conference.
+ *
+ * @param connection The connection to add.
+ * @return True if the connection was successfully added.
+ */
+ public boolean addConnection(Connection connection) {
+ if (connection != null && !mChildConnections.contains(connection)) {
+ if (connection.setConference(this)) {
+ mChildConnections.add(connection);
+ for (Listener l : mListeners) {
+ l.onConnectionAdded(this, connection);
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Removes the specified connection as a child of this conference.
+ *
+ * @param connection The connection to remove.
+ * @return True if the connection was successfully removed.
+ */
+ public void removeConnection(Connection connection) {
+ if (connection != null && mChildConnections.remove(connection)) {
+ connection.resetConference();
+ for (Listener l : mListeners) {
+ l.onConnectionRemoved(this, connection);
+ }
+ }
+ }
+
+ /**
+ * Tears down the conference object and any of it's current connections.
+ */
+ public void destroy() {
+ Log.d(this, "destroying conference : %s", this);
+ // Tear down the children.
+ for (Connection connection : new ArrayList<>(mChildConnections)) {
+ Log.d(this, "removing connection %s", connection);
+ removeConnection(connection);
+ }
+
+ // If not yet disconnected, set the conference call as disconnected first.
+ if (mState != Connection.STATE_DISCONNECTED) {
+ Log.d(this, "setting to disconnected");
+ setDisconnected(DisconnectCause.LOCAL, null);
+ }
+
+ // ...and notify.
+ for (Listener l : mListeners) {
+ l.onDestroyed(this);
+ }
+ }
+
+ /**
+ * Add a listener to be notified of a state change.
+ *
+ * @param listener The new listener.
+ * @return This conference.
+ * @hide
+ */
+ public final Conference addListener(Listener listener) {
+ mListeners.add(listener);
+ return this;
+ }
+
+ /**
+ * Removes the specified listener.
+ *
+ * @param listener The listener to remove.
+ * @return This conference.
+ * @hide
+ */
+ public final Conference removeListener(Listener listener) {
+ mListeners.remove(listener);
+ return this;
+ }
+
+ private void setState(int newState) {
+ if (newState != Connection.STATE_ACTIVE &&
+ newState != Connection.STATE_HOLDING &&
+ newState != Connection.STATE_DISCONNECTED) {
+ Log.w(this, "Unsupported state transition for Conference call.",
+ Connection.stateToString(newState));
+ return;
+ }
+
+ if (mState != newState) {
+ int oldState = mState;
+ mState = newState;
+ for (Listener l : mListeners) {
+ l.onStateChanged(this, oldState, newState);
+ }
+ }
+ }
+}
diff --git a/telecomm/java/android/telecomm/Connection.java b/telecomm/java/android/telecomm/Connection.java
index b323646..c1d5715 100644
--- a/telecomm/java/android/telecomm/Connection.java
+++ b/telecomm/java/android/telecomm/Connection.java
@@ -16,20 +16,57 @@
package android.telecomm;
+import com.android.internal.telecomm.IVideoCallback;
+import com.android.internal.telecomm.IVideoProvider;
+
import android.app.PendingIntent;
import android.net.Uri;
-import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.RemoteException;
+import android.telephony.DisconnectCause;
+import android.view.Surface;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Represents a connection to a remote endpoint that carries voice traffic.
+ * <p>
+ * Implementations create a custom subclass of {@code Connection} and return it to the framework
+ * as the return value of
+ * {@link ConnectionService#onCreateIncomingConnection(PhoneAccountHandle, ConnectionRequest)}
+ * or
+ * {@link ConnectionService#onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)}.
+ * Implementations are then responsible for updating the state of the {@code Connection}, and
+ * must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
+ * longer used and associated resources may be recovered.
*/
public abstract class Connection {
+ public static final int STATE_INITIALIZING = 0;
+
+ public static final int STATE_NEW = 1;
+
+ public static final int STATE_RINGING = 2;
+
+ public static final int STATE_DIALING = 3;
+
+ public static final int STATE_ACTIVE = 4;
+
+ public static final int STATE_HOLDING = 5;
+
+ public static final int STATE_DISCONNECTED = 6;
+
+ // Flag controlling whether PII is emitted into the logs
+ private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
+
+ private static Connection sNullConnection;
+
/** @hide */
public abstract static class Listener {
public void onStateChanged(Connection c, int state) {}
@@ -37,35 +74,374 @@
public void onCallerDisplayNameChanged(
Connection c, String callerDisplayName, int presentation) {}
public void onVideoStateChanged(Connection c, int videoState) {}
- public void onSignalChanged(Connection c, Bundle details) {}
public void onDisconnected(Connection c, int cause, String message) {}
public void onPostDialWait(Connection c, String remaining) {}
public void onRequestingRingback(Connection c, boolean ringback) {}
public void onDestroyed(Connection c) {}
public void onCallCapabilitiesChanged(Connection c, int callCapabilities) {}
- public void onParentConnectionChanged(Connection c, Connection parent) {}
- public void onVideoCallProviderChanged(
- Connection c, ConnectionService.VideoCallProvider videoCallProvider) {}
+ public void onVideoProviderChanged(
+ Connection c, VideoProvider videoProvider) {}
public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
public void onStartActivityFromInCall(Connection c, PendingIntent intent) {}
public void onConferenceableConnectionsChanged(
Connection c, List<Connection> conferenceableConnections) {}
+ public void onConferenceChanged(Connection c, Conference conference) {}
}
- public final class State {
- private State() {}
+ public static abstract class VideoProvider {
- public static final int INITIALIZING = 0;
- public static final int NEW = 1;
- public static final int RINGING = 2;
- public static final int DIALING = 3;
- public static final int ACTIVE = 4;
- public static final int HOLDING = 5;
- public static final int DISCONNECTED = 6;
- public static final int FAILED = 7;
- public static final int CANCELED = 8;
+ /**
+ * Video is not being received (no protocol pause was issued).
+ */
+ public static final int SESSION_EVENT_RX_PAUSE = 1;
+ /**
+ * Video reception has resumed after a SESSION_EVENT_RX_PAUSE.
+ */
+ public static final int SESSION_EVENT_RX_RESUME = 2;
+
+ /**
+ * Video transmission has begun. This occurs after a negotiated start of video transmission
+ * when the underlying protocol has actually begun transmitting video to the remote party.
+ */
+ public static final int SESSION_EVENT_TX_START = 3;
+
+ /**
+ * Video transmission has stopped. This occurs after a negotiated stop of video transmission
+ * when the underlying protocol has actually stopped transmitting video to the remote party.
+ */
+ public static final int SESSION_EVENT_TX_STOP = 4;
+
+ /**
+ * A camera failure has occurred for the selected camera. The In-Call UI can use this as a
+ * cue to inform the user the camera is not available.
+ */
+ public static final int SESSION_EVENT_CAMERA_FAILURE = 5;
+
+ /**
+ * Issued after {@code SESSION_EVENT_CAMERA_FAILURE} when the camera is once again ready for
+ * operation. The In-Call UI can use this as a cue to inform the user that the camera has
+ * become available again.
+ */
+ public static final int SESSION_EVENT_CAMERA_READY = 6;
+
+ /**
+ * Session modify request was successful.
+ */
+ public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1;
+
+ /**
+ * Session modify request failed.
+ */
+ public static final int SESSION_MODIFY_REQUEST_FAIL = 2;
+
+ /**
+ * Session modify request ignored due to invalid parameters.
+ */
+ public static final int SESSION_MODIFY_REQUEST_INVALID = 3;
+
+ private static final int MSG_SET_VIDEO_LISTENER = 1;
+ private static final int MSG_SET_CAMERA = 2;
+ private static final int MSG_SET_PREVIEW_SURFACE = 3;
+ private static final int MSG_SET_DISPLAY_SURFACE = 4;
+ private static final int MSG_SET_DEVICE_ORIENTATION = 5;
+ private static final int MSG_SET_ZOOM = 6;
+ private static final int MSG_SEND_SESSION_MODIFY_REQUEST = 7;
+ private static final int MSG_SEND_SESSION_MODIFY_RESPONSE = 8;
+ private static final int MSG_REQUEST_CAMERA_CAPABILITIES = 9;
+ private static final int MSG_REQUEST_CALL_DATA_USAGE = 10;
+ private static final int MSG_SET_PAUSE_IMAGE = 11;
+
+ private final VideoProvider.VideoProviderHandler
+ mMessageHandler = new VideoProvider.VideoProviderHandler();
+ private final VideoProvider.VideoProviderBinder mBinder;
+ private IVideoCallback mVideoListener;
+
+ /**
+ * Default handler used to consolidate binder method calls onto a single thread.
+ */
+ private final class VideoProviderHandler extends Handler {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_SET_VIDEO_LISTENER:
+ mVideoListener = IVideoCallback.Stub.asInterface((IBinder) msg.obj);
+ break;
+ case MSG_SET_CAMERA:
+ onSetCamera((String) msg.obj);
+ break;
+ case MSG_SET_PREVIEW_SURFACE:
+ onSetPreviewSurface((Surface) msg.obj);
+ break;
+ case MSG_SET_DISPLAY_SURFACE:
+ onSetDisplaySurface((Surface) msg.obj);
+ break;
+ case MSG_SET_DEVICE_ORIENTATION:
+ onSetDeviceOrientation(msg.arg1);
+ break;
+ case MSG_SET_ZOOM:
+ onSetZoom((Float) msg.obj);
+ break;
+ case MSG_SEND_SESSION_MODIFY_REQUEST:
+ onSendSessionModifyRequest((VideoProfile) msg.obj);
+ break;
+ case MSG_SEND_SESSION_MODIFY_RESPONSE:
+ onSendSessionModifyResponse((VideoProfile) msg.obj);
+ break;
+ case MSG_REQUEST_CAMERA_CAPABILITIES:
+ onRequestCameraCapabilities();
+ break;
+ case MSG_REQUEST_CALL_DATA_USAGE:
+ onRequestCallDataUsage();
+ break;
+ case MSG_SET_PAUSE_IMAGE:
+ onSetPauseImage((String) msg.obj);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ /**
+ * IVideoProvider stub implementation.
+ */
+ private final class VideoProviderBinder extends IVideoProvider.Stub {
+ public void setVideoListener(IBinder videoListenerBinder) {
+ mMessageHandler.obtainMessage(
+ MSG_SET_VIDEO_LISTENER, videoListenerBinder).sendToTarget();
+ }
+
+ public void setCamera(String cameraId) {
+ mMessageHandler.obtainMessage(MSG_SET_CAMERA, cameraId).sendToTarget();
+ }
+
+ public void setPreviewSurface(Surface surface) {
+ mMessageHandler.obtainMessage(MSG_SET_PREVIEW_SURFACE, surface).sendToTarget();
+ }
+
+ public void setDisplaySurface(Surface surface) {
+ mMessageHandler.obtainMessage(MSG_SET_DISPLAY_SURFACE, surface).sendToTarget();
+ }
+
+ public void setDeviceOrientation(int rotation) {
+ mMessageHandler.obtainMessage(MSG_SET_DEVICE_ORIENTATION, rotation).sendToTarget();
+ }
+
+ public void setZoom(float value) {
+ mMessageHandler.obtainMessage(MSG_SET_ZOOM, value).sendToTarget();
+ }
+
+ public void sendSessionModifyRequest(VideoProfile requestProfile) {
+ mMessageHandler.obtainMessage(
+ MSG_SEND_SESSION_MODIFY_REQUEST, requestProfile).sendToTarget();
+ }
+
+ public void sendSessionModifyResponse(VideoProfile responseProfile) {
+ mMessageHandler.obtainMessage(
+ MSG_SEND_SESSION_MODIFY_RESPONSE, responseProfile).sendToTarget();
+ }
+
+ public void requestCameraCapabilities() {
+ mMessageHandler.obtainMessage(MSG_REQUEST_CAMERA_CAPABILITIES).sendToTarget();
+ }
+
+ public void requestCallDataUsage() {
+ mMessageHandler.obtainMessage(MSG_REQUEST_CALL_DATA_USAGE).sendToTarget();
+ }
+
+ public void setPauseImage(String uri) {
+ mMessageHandler.obtainMessage(MSG_SET_PAUSE_IMAGE, uri).sendToTarget();
+ }
+ }
+
+ public VideoProvider() {
+ mBinder = new VideoProvider.VideoProviderBinder();
+ }
+
+ /**
+ * Returns binder object which can be used across IPC methods.
+ * @hide
+ */
+ public final IVideoProvider getInterface() {
+ return mBinder;
+ }
+
+ /**
+ * Sets the camera to be used for video recording in a video call.
+ *
+ * @param cameraId The id of the camera.
+ */
+ public abstract void onSetCamera(String cameraId);
+
+ /**
+ * Sets the surface to be used for displaying a preview of what the user's camera is
+ * currently capturing. When video transmission is enabled, this is the video signal which
+ * is sent to the remote device.
+ *
+ * @param surface The surface.
+ */
+ public abstract void onSetPreviewSurface(Surface surface);
+
+ /**
+ * Sets the surface to be used for displaying the video received from the remote device.
+ *
+ * @param surface The surface.
+ */
+ public abstract void onSetDisplaySurface(Surface surface);
+
+ /**
+ * Sets the device orientation, in degrees. Assumes that a standard portrait orientation of
+ * the device is 0 degrees.
+ *
+ * @param rotation The device orientation, in degrees.
+ */
+ public abstract void onSetDeviceOrientation(int rotation);
+
+ /**
+ * Sets camera zoom ratio.
+ *
+ * @param value The camera zoom ratio.
+ */
+ public abstract void onSetZoom(float value);
+
+ /**
+ * Issues a request to modify the properties of the current session. The request is
+ * sent to the remote device where it it handled by the In-Call UI.
+ * Some examples of session modification requests: upgrade call from audio to video,
+ * downgrade call from video to audio, pause video.
+ *
+ * @param requestProfile The requested call video properties.
+ */
+ public abstract void onSendSessionModifyRequest(VideoProfile requestProfile);
+
+ /**te
+ * Provides a response to a request to change the current call session video
+ * properties.
+ * This is in response to a request the InCall UI has received via the InCall UI.
+ *
+ * @param responseProfile The response call video properties.
+ */
+ public abstract void onSendSessionModifyResponse(VideoProfile responseProfile);
+
+ /**
+ * Issues a request to the video provider to retrieve the camera capabilities.
+ * Camera capabilities are reported back to the caller via the In-Call UI.
+ */
+ public abstract void onRequestCameraCapabilities();
+
+ /**
+ * Issues a request to the video telephony framework to retrieve the cumulative data usage
+ * for the current call. Data usage is reported back to the caller via the
+ * InCall UI.
+ */
+ public abstract void onRequestCallDataUsage();
+
+ /**
+ * Provides the video telephony framework with the URI of an image to be displayed to remote
+ * devices when the video signal is paused.
+ *
+ * @param uri URI of image to display.
+ */
+ public abstract void onSetPauseImage(String uri);
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * @param videoProfile The requested video call profile.
+ */
+ public void receiveSessionModifyRequest(VideoProfile videoProfile) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.receiveSessionModifyRequest(videoProfile);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * @param status Status of the session modify request. Valid values are
+ * {@link VideoProvider#SESSION_MODIFY_REQUEST_SUCCESS},
+ * {@link VideoProvider#SESSION_MODIFY_REQUEST_FAIL},
+ * {@link VideoProvider#SESSION_MODIFY_REQUEST_INVALID}
+ * @param requestedProfile The original request which was sent to the remote device.
+ * @param responseProfile The actual profile changes made by the remote device.
+ */
+ public void receiveSessionModifyResponse(int status,
+ VideoProfile requestedProfile, VideoProfile responseProfile) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.receiveSessionModifyResponse(
+ status, requestedProfile, responseProfile);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * Valid values are: {@link VideoProvider#SESSION_EVENT_RX_PAUSE},
+ * {@link VideoProvider#SESSION_EVENT_RX_RESUME},
+ * {@link VideoProvider#SESSION_EVENT_TX_START},
+ * {@link VideoProvider#SESSION_EVENT_TX_STOP}
+ *
+ * @param event The event.
+ */
+ public void handleCallSessionEvent(int event) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.handleCallSessionEvent(event);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * @param width The updated peer video width.
+ * @param height The updated peer video height.
+ */
+ public void changePeerDimensions(int width, int height) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.changePeerDimensions(width, height);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * @param dataUsage The updated data usage.
+ */
+ public void changeCallDataUsage(int dataUsage) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.changeCallDataUsage(dataUsage);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
+
+ /**
+ * Invokes callback method defined in In-Call UI.
+ *
+ * @param cameraCapabilities The changed camera capabilities.
+ */
+ public void changeCameraCapabilities(CameraCapabilities cameraCapabilities) {
+ if (mVideoListener != null) {
+ try {
+ mVideoListener.changeCameraCapabilities(cameraCapabilities);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
}
private final Listener mConnectionDeathListener = new Listener() {
@@ -77,26 +453,34 @@
}
};
- private final Set<Listener> mListeners = new CopyOnWriteArraySet<>();
- private final List<Connection> mChildConnections = new ArrayList<>();
+ /**
+ * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
+ * load factor before resizing, 1 means we only expect a single thread to
+ * access the map so make only a single shard
+ */
+ private final Set<Listener> mListeners = Collections.newSetFromMap(
+ new ConcurrentHashMap<Listener, Boolean>(8, 0.9f, 1));
private final List<Connection> mConferenceableConnections = new ArrayList<>();
+ private final List<Connection> mUnmodifiableConferenceableConnections =
+ Collections.unmodifiableList(mConferenceableConnections);
- private int mState = State.NEW;
- private CallAudioState mCallAudioState;
+ private int mState = STATE_NEW;
+ private AudioState mAudioState;
private Uri mHandle;
private int mHandlePresentation;
private String mCallerDisplayName;
private int mCallerDisplayNamePresentation;
private boolean mRequestingRingback = false;
private int mCallCapabilities;
- private Connection mParentConnection;
- private ConnectionService.VideoCallProvider mVideoCallProvider;
+ private VideoProvider mVideoProvider;
private boolean mAudioModeIsVoip;
private StatusHints mStatusHints;
private int mVideoState;
private int mFailureCode;
private String mFailureMessage;
private boolean mIsCanceled;
+ private Conference mConference;
+ private ConnectionService mConnectionService;
/**
* Create a new Connection.
@@ -111,7 +495,7 @@
}
/**
- * @return The {@link CallPropertyPresentation} which controls how the handle is shown.
+ * @return The {@link PropertyPresentation} which controls how the handle is shown.
*/
public final int getHandlePresentation() {
return mHandlePresentation;
@@ -125,7 +509,7 @@
}
/**
- * @return The {@link CallPropertyPresentation} which controls how the caller display name is
+ * @return The {@link PropertyPresentation} which controls how the caller display name is
* shown.
*/
public final int getCallerDisplayNamePresentation() {
@@ -141,10 +525,10 @@
/**
* Returns the video state of the call.
- * Valid values: {@link android.telecomm.VideoCallProfile.VideoState#AUDIO_ONLY},
- * {@link android.telecomm.VideoCallProfile.VideoState#BIDIRECTIONAL},
- * {@link android.telecomm.VideoCallProfile.VideoState#TX_ENABLED},
- * {@link android.telecomm.VideoCallProfile.VideoState#RX_ENABLED}.
+ * Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#TX_ENABLED},
+ * {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @return The video state of the call.
*/
@@ -157,8 +541,16 @@
* being routed by the system. This is {@code null} if this Connection
* does not directly know about its audio state.
*/
- public final CallAudioState getCallAudioState() {
- return mCallAudioState;
+ public final AudioState getAudioState() {
+ return mAudioState;
+ }
+
+ /**
+ * @return The conference that this connection is a part of. Null if it is not part of any
+ * conference.
+ */
+ public final Conference getConference() {
+ return mConference;
}
/**
@@ -170,13 +562,6 @@
}
/**
- * Returns whether this connection is a conference connection (has child connections).
- */
- public final boolean isConferenceConnection() {
- return !mChildConnections.isEmpty();
- }
-
- /**
* @return True if the connection's audio mode is VOIP.
*/
public final boolean getAudioModeIsVoip() {
@@ -212,7 +597,9 @@
* @hide
*/
public final Connection removeConnectionListener(Listener l) {
- mListeners.remove(l);
+ if (l != null) {
+ mListeners.remove(l);
+ }
return this;
}
@@ -236,36 +623,32 @@
* @param state The new audio state.
* @hide
*/
- final void setAudioState(CallAudioState state) {
+ final void setAudioState(AudioState state) {
Log.d(this, "setAudioState %s", state);
- mCallAudioState = state;
+ mAudioState = state;
onSetAudioState(state);
}
/**
- * @param state An integer value from {@link State}.
+ * @param state An integer value of a {@code STATE_*} constant.
* @return A string representation of the value.
*/
public static String stateToString(int state) {
switch (state) {
- case State.INITIALIZING:
- return "INITIALIZING";
- case State.NEW:
- return "NEW";
- case State.RINGING:
- return "RINGING";
- case State.DIALING:
- return "DIALING";
- case State.ACTIVE:
- return "ACTIVE";
- case State.HOLDING:
- return "HOLDING";
- case State.DISCONNECTED:
+ case STATE_INITIALIZING:
+ return "STATE_INITIALIZING";
+ case STATE_NEW:
+ return "STATE_NEW";
+ case STATE_RINGING:
+ return "STATE_RINGING";
+ case STATE_DIALING:
+ return "STATE_DIALING";
+ case STATE_ACTIVE:
+ return "STATE_ACTIVE";
+ case STATE_HOLDING:
+ return "STATE_HOLDING";
+ case STATE_DISCONNECTED:
return "DISCONNECTED";
- case State.FAILED:
- return "FAILED";
- case State.CANCELED:
- return "CANCELED";
default:
Log.wtf(Connection.class, "Unknown state %d", state);
return "UNKNOWN";
@@ -273,35 +656,7 @@
}
/**
- * TODO: Needs documentation.
- */
- public final void setParentConnection(Connection parentConnection) {
- Log.d(this, "parenting %s to %s", this, parentConnection);
- if (mParentConnection != parentConnection) {
- if (mParentConnection != null) {
- mParentConnection.removeChild(this);
- }
- mParentConnection = parentConnection;
- if (mParentConnection != null) {
- mParentConnection.addChild(this);
- // do something if the child connections goes down to ZERO.
- }
- for (Listener l : mListeners) {
- l.onParentConnectionChanged(this, mParentConnection);
- }
- }
- }
-
- public final Connection getParentConnection() {
- return mParentConnection;
- }
-
- public final List<Connection> getChildConnections() {
- return mChildConnections;
- }
-
- /**
- * Returns the connection's {@link CallCapabilities}
+ * Returns the connection's {@link PhoneCapabilities}
*/
public final int getCallCapabilities() {
return mCallCapabilities;
@@ -311,7 +666,7 @@
* Sets the value of the {@link #getHandle()} property.
*
* @param handle The new handle.
- * @param presentation The {@link CallPropertyPresentation} which controls how the handle is
+ * @param presentation The {@link PropertyPresentation} which controls how the handle is
* shown.
*/
public final void setHandle(Uri handle, int presentation) {
@@ -327,7 +682,7 @@
* Sets the caller display name (CNAP).
*
* @param callerDisplayName The new display name.
- * @param presentation The {@link CallPropertyPresentation} which controls how the name is
+ * @param presentation The {@link PropertyPresentation} which controls how the name is
* shown.
*/
public final void setCallerDisplayName(String callerDisplayName, int presentation) {
@@ -340,38 +695,11 @@
}
/**
- * Cancel the {@link Connection}. Once this is called, the {@link Connection} will not be used,
- * and no subsequent {@link Connection}s will be attempted.
- */
- public final void setCanceled() {
- Log.d(this, "setCanceled");
- setState(State.CANCELED);
- }
-
- /**
- * Move the {@link Connection} to the {@link State#FAILED} state, with the given code
- * ({@see DisconnectCause}) and message. This message is not shown to the user, but is useful
- * for logging and debugging purposes.
- * <p>
- * After calling this, the {@link Connection} will not be used.
- *
- * @param code The {@link android.telephony.DisconnectCause} indicating why the connection
- * failed.
- * @param message A message explaining why the {@link Connection} failed.
- */
- public final void setFailed(int code, String message) {
- Log.d(this, "setFailed (%d: %s)", code, message);
- mFailureCode = code;
- mFailureMessage = message;
- setState(State.FAILED);
- }
-
- /**
* Set the video state for the connection.
- * Valid values: {@link android.telecomm.VideoCallProfile.VideoState#AUDIO_ONLY},
- * {@link android.telecomm.VideoCallProfile.VideoState#BIDIRECTIONAL},
- * {@link android.telecomm.VideoCallProfile.VideoState#TX_ENABLED},
- * {@link android.telecomm.VideoCallProfile.VideoState#RX_ENABLED}.
+ * Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#TX_ENABLED},
+ * {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @param videoState The new video state.
*/
@@ -389,68 +717,68 @@
*/
public final void setActive() {
setRequestingRingback(false);
- setState(State.ACTIVE);
+ setState(STATE_ACTIVE);
}
/**
* Sets state to ringing (e.g., an inbound ringing call).
*/
public final void setRinging() {
- setState(State.RINGING);
+ setState(STATE_RINGING);
}
/**
* Sets state to initializing (this Connection is not yet ready to be used).
*/
public final void setInitializing() {
- setState(State.INITIALIZING);
+ setState(STATE_INITIALIZING);
}
/**
* Sets state to initialized (the Connection has been set up and is now ready to be used).
*/
public final void setInitialized() {
- setState(State.NEW);
+ setState(STATE_NEW);
}
/**
* Sets state to dialing (e.g., dialing an outbound call).
*/
public final void setDialing() {
- setState(State.DIALING);
+ setState(STATE_DIALING);
}
/**
* Sets state to be on hold.
*/
public final void setOnHold() {
- setState(State.HOLDING);
+ setState(STATE_HOLDING);
}
/**
* Sets the video call provider.
- * @param videoCallProvider The video call provider.
+ * @param videoProvider The video provider.
*/
- public final void setVideoCallProvider(ConnectionService.VideoCallProvider videoCallProvider) {
- mVideoCallProvider = videoCallProvider;
+ public final void setVideoProvider(VideoProvider videoProvider) {
+ mVideoProvider = videoProvider;
for (Listener l : mListeners) {
- l.onVideoCallProviderChanged(this, videoCallProvider);
+ l.onVideoProviderChanged(this, videoProvider);
}
}
- public final ConnectionService.VideoCallProvider getVideoCallProvider() {
- return mVideoCallProvider;
+ public final VideoProvider getVideoProvider() {
+ return mVideoProvider;
}
/**
* Sets state to disconnected.
*
* @param cause The reason for the disconnection, any of
- * {@link android.telephony.DisconnectCause}.
+ * {@link DisconnectCause}.
* @param message Optional call-service-provided message about the disconnect.
*/
public final void setDisconnected(int cause, String message) {
- setState(State.DISCONNECTED);
+ setState(STATE_DISCONNECTED);
Log.d(this, "Disconnected with cause %d message %s", cause, message);
for (Listener l : mListeners) {
l.onDisconnected(this, cause, message);
@@ -482,7 +810,7 @@
}
/**
- * Sets the connection's {@link CallCapabilities}.
+ * Sets the connection's {@link PhoneCapabilities}.
*
* @param callCapabilities The new call capabilities.
*/
@@ -499,24 +827,8 @@
* Tears down the Connection object.
*/
public final void destroy() {
- // It is possible that onDestroy() will trigger the listener to remove itself which will
- // result in a concurrent modification exception. To counteract this we make a copy of the
- // listeners and iterate on that.
- for (Listener l : new ArrayList<>(mListeners)) {
- if (mListeners.contains(l)) {
- l.onDestroyed(this);
- }
- }
- }
-
- /**
- * Sets the current signal levels for the underlying data transport.
- *
- * @param details A {@link android.os.Bundle} containing details of the current level.
- */
- public final void setSignal(Bundle details) {
for (Listener l : mListeners) {
- l.onSignalChanged(this, details);
+ l.onDestroyed(this);
}
}
@@ -563,6 +875,67 @@
}
/**
+ * Obtains the connections with which this connection can be conferenced.
+ */
+ public final List<Connection> getConferenceableConnections() {
+ return mUnmodifiableConferenceableConnections;
+ }
+
+ /*
+ * @hide
+ */
+ public final void setConnectionService(ConnectionService connectionService) {
+ if (mConnectionService != null) {
+ Log.e(this, new Exception(), "Trying to set ConnectionService on a connection " +
+ "which is already associated with another ConnectionService.");
+ } else {
+ mConnectionService = connectionService;
+ }
+ }
+
+ /**
+ * @hide
+ */
+ public final void unsetConnectionService(ConnectionService connectionService) {
+ if (mConnectionService != connectionService) {
+ Log.e(this, new Exception(), "Trying to remove ConnectionService from a Connection " +
+ "that does not belong to the ConnectionService.");
+ } else {
+ mConnectionService = null;
+ }
+ }
+
+ /**
+ * Sets the conference that this connection is a part of. This will fail if the connection is
+ * already part of a conference call. {@link #resetConference} to un-set the conference first.
+ *
+ * @param conference The conference.
+ * @return {@code true} if the conference was successfully set.
+ * @hide
+ */
+ public final boolean setConference(Conference conference) {
+ // We check to see if it is already part of another conference.
+ if (mConference == null && mConnectionService != null &&
+ mConnectionService.containsConference(conference)) {
+ mConference = conference;
+ fireConferenceChanged();
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Resets the conference that this connection is a part of.
+ * @hide
+ */
+ public final void resetConference() {
+ if (mConference != null) {
+ mConference = null;
+ fireConferenceChanged();
+ }
+ }
+
+ /**
* Launches an activity for this connection on top of the in-call UI.
*
* @param intent The intent to use to start the activity.
@@ -577,17 +950,17 @@
}
/**
- * Notifies this Connection that the {@link #getCallAudioState()} property has a new value.
+ * Notifies this Connection that the {@link #getAudioState()} property has a new value.
*
* @param state The new call audio state.
*/
- public void onSetAudioState(CallAudioState state) {}
+ public void onSetAudioState(AudioState state) {}
/**
* Notifies this Connection of an internal state change. This method is called after the
* state is changed.
*
- * @param state The new state, a {@link Connection.State} member.
+ * @param state The new state, one of the {@code STATE_*} constants.
*/
public void onSetState(int state) {}
@@ -629,7 +1002,7 @@
public void onUnhold() {}
/**
- * Notifies this Connection, which is in {@link State#RINGING}, of
+ * Notifies this Connection, which is in {@link #STATE_RINGING}, of
* a request to accept.
*
* @param videoState The video state in which to answer the call.
@@ -637,7 +1010,7 @@
public void onAnswer(int videoState) {}
/**
- * Notifies this Connection, which is in {@link State#RINGING}, of
+ * Notifies this Connection, which is in {@link #STATE_RINGING}, of
* a request to reject.
*/
public void onReject() {}
@@ -648,17 +1021,6 @@
public void onPostDialContinue(boolean proceed) {}
/**
- * Swap this call with a background call. This is used for calls that don't support hold,
- * e.g. CDMA.
- */
- public void onSwapWithBackgroundCall() {}
-
- /**
- * TODO: Needs documentation.
- */
- public void onChildrenChanged(List<Connection> children) {}
-
- /**
* Called when the phone account UI was clicked.
*/
public void onPhoneAccountClicked() {}
@@ -673,22 +1035,41 @@
*/
public void onConferenceWith(Connection otherConnection) {}
- private void addChild(Connection connection) {
- Log.d(this, "adding child %s", connection);
- mChildConnections.add(connection);
- onChildrenChanged(mChildConnections);
+ static String toLogSafePhoneNumber(String number) {
+ // For unknown number, log empty string.
+ if (number == null) {
+ return "";
+ }
+
+ if (PII_DEBUG) {
+ // When PII_DEBUG is true we emit PII.
+ return number;
+ }
+
+ // Do exactly same thing as Uri#toSafeString() does, which will enable us to compare
+ // sanitized phone numbers.
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < number.length(); i++) {
+ char c = number.charAt(i);
+ if (c == '-' || c == '@' || c == '.') {
+ builder.append(c);
+ } else {
+ builder.append('x');
+ }
+ }
+ return builder.toString();
}
- private void removeChild(Connection connection) {
- Log.d(this, "removing child %s", connection);
- mChildConnections.remove(connection);
- onChildrenChanged(mChildConnections);
+ static synchronized Connection getNullConnection() {
+ if (sNullConnection == null) {
+ sNullConnection = new Connection() {};
+ }
+ return sNullConnection;
}
private void setState(int state) {
- if (mState == State.FAILED || mState == State.CANCELED) {
- Log.d(this, "Connection already %s; cannot transition out of this state.",
- stateToString(mState));
+ if (mState == STATE_DISCONNECTED && mState != state) {
+ Log.d(this, "Connection already DISCONNECTED; cannot transition out of this state.");
return;
}
if (mState != state) {
@@ -701,35 +1082,43 @@
}
}
+ static class FailureSignalingConnection extends Connection {
+ public FailureSignalingConnection(int code, String message) {
+ setDisconnected(code, message);
+ }
+ }
+
/**
- * Return a {@link Connection} which represents a failed connection attempt. The returned
- * {@link Connection} will have {@link #getFailureCode()}, {@link #getFailureMessage()}, and
- * {@link #getState()} set appropriately, but the {@link Connection} itself should not be used
- * for anything.
+ * Return a {@code Connection} which represents a failed connection attempt. The returned
+ * {@code Connection} will have a {@link #getFailureCode()} and {@link #getFailureMessage()}
+ * as specified, a {@link #getState()} of {@link #STATE_DISCONNECTED}.
+ * <p>
+ * The returned {@code Connection} can be assumed to {@link #destroy()} itself when appropriate,
+ * so users of this method need not maintain a reference to its return value to destroy it.
*
* @param code The failure code ({@see DisconnectCause}).
* @param message A reason for why the connection failed (not intended to be shown to the user).
- * @return A {@link Connection} which indicates failure.
+ * @return A {@code Connection} which indicates failure.
*/
- public static Connection getFailedConnection(final int code, final String message) {
- return new Connection() {{
- setFailed(code, message);
- }};
+ public static Connection createFailedConnection(final int code, final String message) {
+ return new FailureSignalingConnection(code, message);
}
- private static final Connection CANCELED_CONNECTION = new Connection() {{
- setCanceled();
- }};
+ private static final Connection CANCELED_CONNECTION =
+ new FailureSignalingConnection(DisconnectCause.OUTGOING_CANCELED, null);
/**
- * Return a {@link Connection} which represents a canceled a connection attempt. The returned
- * {@link Connection} will have state {@link State#CANCELED}, and cannot be moved out of that
- * state. This connection should not be used for anything, and no other {@link Connection}s
- * should be attempted.
+ * Return a {@code Connection} which represents a canceled connection attempt. The returned
+ * {@code Connection} will have state {@link #STATE_DISCONNECTED}, and cannot be moved out of
+ * that state. This connection should not be used for anything, and no other
+ * {@code Connection}s should be attempted.
+ * <p>
+ * The returned {@code Connection} can be assumed to {@link #destroy()} itself when appropriate,
+ * so users of this method need not maintain a reference to its return value to destroy it.
*
- * @return A {@link Connection} which indicates that the underlying call should be canceled.
+ * @return A {@code Connection} which indicates that the underlying call should be canceled.
*/
- public static Connection getCanceledConnection() {
+ public static Connection createCanceledConnection() {
return CANCELED_CONNECTION;
}
@@ -739,6 +1128,12 @@
}
}
+ private final void fireConferenceChanged() {
+ for (Listener l : mListeners) {
+ l.onConferenceChanged(this, mConference);
+ }
+ }
+
private final void clearConferenceableList() {
for (Connection c : mConferenceableConnections) {
c.removeConnectionListener(mConnectionDeathListener);
diff --git a/telecomm/java/android/telecomm/ConnectionRequest.aidl b/telecomm/java/android/telecomm/ConnectionRequest.aidl
index 72e5c8c..6081c22 100644
--- a/telecomm/java/android/telecomm/ConnectionRequest.aidl
+++ b/telecomm/java/android/telecomm/ConnectionRequest.aidl
@@ -16,4 +16,7 @@
package android.telecomm;
+/**
+ * {@hide}
+ */
parcelable ConnectionRequest;
diff --git a/telecomm/java/android/telecomm/ConnectionRequest.java b/telecomm/java/android/telecomm/ConnectionRequest.java
index 1016091..5ea1d1a 100644
--- a/telecomm/java/android/telecomm/ConnectionRequest.java
+++ b/telecomm/java/android/telecomm/ConnectionRequest.java
@@ -20,8 +20,6 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.os.ResultReceiver;
-import android.telephony.DisconnectCause;
/**
* Simple data container encapsulating a request to some entity to
@@ -30,10 +28,7 @@
public final class ConnectionRequest implements Parcelable {
// TODO: Token to limit recursive invocations
- // TODO: Consider upgrading "mHandle" to ordered list of handles, indicating a set of phone
- // numbers that would satisfy the client's needs, in order of preference
private final PhoneAccountHandle mAccountHandle;
- private final String mCallId;
private final Uri mHandle;
private final int mHandlePresentation;
private final Bundle mExtras;
@@ -41,22 +36,19 @@
/**
* @param accountHandle The accountHandle which should be used to place the call.
- * @param callId An identifier for this call.
* @param handle The handle (e.g., phone number) to which the {@link Connection} is to connect.
- * @param handlePresentation The {@link CallPropertyPresentation} which controls how the handle
+ * @param handlePresentation The {@link PropertyPresentation} which controls how the handle
* is shown.
* @param extras Application-specific extra data.
* @param videoState Determines the video state for the connection.
*/
public ConnectionRequest(
PhoneAccountHandle accountHandle,
- String callId,
Uri handle,
int handlePresentation,
Bundle extras,
int videoState) {
mAccountHandle = accountHandle;
- mCallId = callId;
mHandle = handle;
mHandlePresentation = handlePresentation;
mExtras = extras;
@@ -65,7 +57,6 @@
private ConnectionRequest(Parcel in) {
mAccountHandle = in.readParcelable(getClass().getClassLoader());
- mCallId = in.readString();
mHandle = in.readParcelable(getClass().getClassLoader());
mHandlePresentation = in.readInt();
mExtras = in.readParcelable(getClass().getClassLoader());
@@ -78,17 +69,12 @@
public PhoneAccountHandle getAccountHandle() { return mAccountHandle; }
/**
- * An identifier for this call.
- */
- public String getCallId() { return mCallId; }
-
- /**
* The handle (e.g., phone number) to which the {@link Connection} is to connect.
*/
public Uri getHandle() { return mHandle; }
/**
- * The {@link CallPropertyPresentation} which controls how the handle is shown.
+ * The {@link PropertyPresentation} which controls how the handle is shown.
*/
public int getHandlePresentation() { return mHandlePresentation; }
@@ -100,11 +86,11 @@
public Bundle getExtras() { return mExtras; }
/**
- * Determines the video state for the connection.
- * Valid values: {@link VideoCallProfile.VideoState#AUDIO_ONLY},
- * {@link VideoCallProfile.VideoState#BIDIRECTIONAL},
- * {@link VideoCallProfile.VideoState#TX_ENABLED},
- * {@link VideoCallProfile.VideoState#RX_ENABLED}.
+ * Describes the video states supported by the client requesting the connection.
+ * Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#TX_ENABLED},
+ * {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @return The video state for the connection.
*/
@@ -114,10 +100,10 @@
@Override
public String toString() {
- return String.format("PhoneConnectionRequest %s %s",
+ return String.format("ConnectionRequest %s %s",
mHandle == null
? Uri.EMPTY
- : ConnectionService.toLogSafePhoneNumber(mHandle.toString()),
+ : Connection.toLogSafePhoneNumber(mHandle.toString()),
mExtras == null ? "" : mExtras);
}
@@ -144,7 +130,6 @@
@Override
public void writeToParcel(Parcel destination, int flags) {
destination.writeParcelable(mAccountHandle, 0);
- destination.writeString(mCallId);
destination.writeParcelable(mHandle, 0);
destination.writeInt(mHandlePresentation);
destination.writeParcelable(mExtras, 0);
diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java
index 80c7bbc..03b6c7b 100644
--- a/telecomm/java/android/telecomm/ConnectionService.java
+++ b/telecomm/java/android/telecomm/ConnectionService.java
@@ -17,26 +17,20 @@
package android.telecomm;
import android.annotation.SdkConstant;
-import android.annotation.SdkConstant.SdkConstantType;
import android.app.PendingIntent;
import android.app.Service;
import android.content.ComponentName;
import android.content.Intent;
import android.net.Uri;
-import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.telephony.DisconnectCause;
-import android.os.RemoteException;
-import android.view.Surface;
import com.android.internal.os.SomeArgs;
import com.android.internal.telecomm.IConnectionService;
import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoCallCallback;
-import com.android.internal.telecomm.IVideoCallProvider;
import com.android.internal.telecomm.RemoteServiceCallback;
import java.util.ArrayList;
@@ -45,6 +39,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
/**
* A {@link android.app.Service} that provides telephone connections to processes running on an
@@ -54,7 +50,7 @@
/**
* The {@link Intent} that must be declared as handled by the service.
*/
- @SdkConstant(SdkConstantType.SERVICE_ACTION)
+ @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
public static final String SERVICE_INTERFACE = "android.telecomm.ConnectionService";
// Flag controlling whether PII is emitted into the logs
@@ -73,51 +69,19 @@
private static final int MSG_STOP_DTMF_TONE = 11;
private static final int MSG_CONFERENCE = 12;
private static final int MSG_SPLIT_FROM_CONFERENCE = 13;
- private static final int MSG_SWAP_WITH_BACKGROUND_CALL = 14;
- private static final int MSG_ON_POST_DIAL_CONTINUE = 15;
- private static final int MSG_ON_PHONE_ACCOUNT_CLICKED = 16;
- private static final int MSG_REMOVE_CONNECTION_SERVICE_ADAPTER = 17;
-
- private static Connection sNullConnection;
+ private static final int MSG_ON_POST_DIAL_CONTINUE = 14;
+ private static final int MSG_ON_PHONE_ACCOUNT_CLICKED = 15;
+ private static final int MSG_REMOVE_CONNECTION_SERVICE_ADAPTER = 16;
private final Map<String, Connection> mConnectionById = new HashMap<>();
private final Map<Connection, String> mIdByConnection = new HashMap<>();
+ private final Map<String, Conference> mConferenceById = new HashMap<>();
+ private final Map<Conference, String> mIdByConference = new HashMap<>();
private final RemoteConnectionManager mRemoteConnectionManager = new RemoteConnectionManager();
-
- private boolean mAreAccountsInitialized = false;
private final List<Runnable> mPreInitializationConnectionRequests = new ArrayList<>();
private final ConnectionServiceAdapter mAdapter = new ConnectionServiceAdapter();
- /**
- * A callback for providing the result of creating a connection.
- */
- public interface CreateConnectionResponse<CONNECTION> {
- /**
- * Tells Telecomm that an attempt to create the connection succeeded.
- *
- * @param request The original request.
- * @param connection The connection.
- */
- void onSuccess(ConnectionRequest request, CONNECTION connection);
-
- /**
- * Tells Telecomm that an attempt to create the connection failed. Telecomm will try a
- * different service until a service cancels the process or completes it successfully.
- *
- * @param request The original request.
- * @param code An integer code indicating the reason for failure.
- * @param msg A message explaining the reason for failure.
- */
- void onFailure(ConnectionRequest request, int code, String msg);
-
- /**
- * Tells Telecomm to cancel creating the connection. Telecomm will stop trying to create
- * the connection an no more services will be tried.
- *
- * @param request The original request.
- */
- void onCancel(ConnectionRequest request);
- }
+ private boolean mAreAccountsInitialized = false;
private final IBinder mBinder = new IConnectionService.Stub() {
@Override
@@ -132,11 +96,13 @@
@Override
public void createConnection(
PhoneAccountHandle connectionManagerPhoneAccount,
+ String id,
ConnectionRequest request,
boolean isIncoming) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = connectionManagerPhoneAccount;
- args.arg2 = request;
+ args.arg2 = id;
+ args.arg3 = request;
args.argi1 = isIncoming ? 1 : 0;
mHandler.obtainMessage(MSG_CREATE_CONNECTION, args).sendToTarget();
}
@@ -175,7 +141,7 @@
}
@Override
- public void onAudioStateChanged(String callId, CallAudioState audioState) {
+ public void onAudioStateChanged(String callId, AudioState audioState) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
args.arg2 = audioState;
@@ -193,10 +159,10 @@
}
@Override
- public void conference(String conferenceCallId, String callId) {
+ public void conference(String callId1, String callId2) {
SomeArgs args = SomeArgs.obtain();
- args.arg1 = conferenceCallId;
- args.arg2 = callId;
+ args.arg1 = callId1;
+ args.arg2 = callId2;
mHandler.obtainMessage(MSG_CONFERENCE, args).sendToTarget();
}
@@ -206,11 +172,6 @@
}
@Override
- public void swapWithBackgroundCall(String callId) {
- mHandler.obtainMessage(MSG_SWAP_WITH_BACKGROUND_CALL, callId).sendToTarget();
- }
-
- @Override
public void onPostDialContinue(String callId, boolean proceed) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = callId;
@@ -240,22 +201,27 @@
try {
final PhoneAccountHandle connectionManagerPhoneAccount =
(PhoneAccountHandle) args.arg1;
- final ConnectionRequest request = (ConnectionRequest) args.arg2;
+ final String id = (String) args.arg2;
+ final ConnectionRequest request = (ConnectionRequest) args.arg3;
final boolean isIncoming = args.argi1 == 1;
if (!mAreAccountsInitialized) {
- Log.d(this, "Enqueueing pre-init request %s", request.getCallId());
+ Log.d(this, "Enqueueing pre-init request %s", id);
mPreInitializationConnectionRequests.add(new Runnable() {
@Override
public void run() {
createConnection(
connectionManagerPhoneAccount,
+ id,
request,
isIncoming);
}
});
} else {
- Log.d(this, "Immediately processing request %s", request.getCallId());
- createConnection(connectionManagerPhoneAccount, request, isIncoming);
+ createConnection(
+ connectionManagerPhoneAccount,
+ id,
+ request,
+ isIncoming);
}
} finally {
args.recycle();
@@ -292,7 +258,7 @@
SomeArgs args = (SomeArgs) msg.obj;
try {
String callId = (String) args.arg1;
- CallAudioState audioState = (CallAudioState) args.arg2;
+ AudioState audioState = (AudioState) args.arg2;
onAudioStateChanged(callId, audioState);
} finally {
args.recycle();
@@ -308,9 +274,9 @@
case MSG_CONFERENCE: {
SomeArgs args = (SomeArgs) msg.obj;
try {
- String conferenceCallId = (String) args.arg1;
- String callId = (String) args.arg2;
- conference(conferenceCallId, callId);
+ String callId1 = (String) args.arg1;
+ String callId2 = (String) args.arg2;
+ conference(callId1, callId2);
} finally {
args.recycle();
}
@@ -319,9 +285,6 @@
case MSG_SPLIT_FROM_CONFERENCE:
splitFromConference((String) msg.obj);
break;
- case MSG_SWAP_WITH_BACKGROUND_CALL:
- swapWithBackgroundCall((String) msg.obj);
- break;
case MSG_ON_POST_DIAL_CONTINUE: {
SomeArgs args = (SomeArgs) msg.obj;
try {
@@ -342,28 +305,73 @@
}
};
+ private final Conference.Listener mConferenceListener = new Conference.Listener() {
+ @Override
+ public void onStateChanged(Conference conference, int oldState, int newState) {
+ String id = mIdByConference.get(conference);
+ switch (newState) {
+ case Connection.STATE_ACTIVE:
+ mAdapter.setActive(id);
+ break;
+ case Connection.STATE_HOLDING:
+ mAdapter.setOnHold(id);
+ break;
+ case Connection.STATE_DISCONNECTED:
+ // handled by onDisconnected
+ break;
+ }
+ }
+
+ @Override
+ public void onDisconnected(Conference conference, int cause, String message) {
+ String id = mIdByConference.get(conference);
+ mAdapter.setDisconnected(id, cause, message);
+ }
+
+ @Override
+ public void onConnectionAdded(Conference conference, Connection connection) {
+ }
+
+ @Override
+ public void onConnectionRemoved(Conference conference, Connection connection) {
+ }
+
+ @Override
+ public void onDestroyed(Conference conference) {
+ removeConference(conference);
+ }
+
+ @Override
+ public void onCapabilitiesChanged(Conference conference, int capabilities) {
+ String id = mIdByConference.get(conference);
+ Log.d(this, "call capabilities: conference: %s",
+ PhoneCapabilities.toString(capabilities));
+ mAdapter.setCallCapabilities(id, capabilities);
+ }
+ };
+
private final Connection.Listener mConnectionListener = new Connection.Listener() {
@Override
public void onStateChanged(Connection c, int state) {
String id = mIdByConnection.get(c);
Log.d(this, "Adapter set state %s %s", id, Connection.stateToString(state));
switch (state) {
- case Connection.State.ACTIVE:
+ case Connection.STATE_ACTIVE:
mAdapter.setActive(id);
break;
- case Connection.State.DIALING:
+ case Connection.STATE_DIALING:
mAdapter.setDialing(id);
break;
- case Connection.State.DISCONNECTED:
+ case Connection.STATE_DISCONNECTED:
// Handled in onDisconnected()
break;
- case Connection.State.HOLDING:
+ case Connection.STATE_HOLDING:
mAdapter.setOnHold(id);
break;
- case Connection.State.NEW:
+ case Connection.STATE_NEW:
// Nothing to tell Telecomm
break;
- case Connection.State.RINGING:
+ case Connection.STATE_RINGING:
mAdapter.setRinging(id);
break;
}
@@ -397,11 +405,6 @@
}
@Override
- public void onSignalChanged(Connection c, Bundle details) {
- // TODO: Unsupported yet
- }
-
- @Override
public void onDestroyed(Connection c) {
removeConnection(c);
}
@@ -421,24 +424,17 @@
}
@Override
- public void onCallCapabilitiesChanged(Connection c, int callCapabilities) {
+ public void onCallCapabilitiesChanged(Connection c, int capabilities) {
String id = mIdByConnection.get(c);
- Log.d(this, "call capabilities: parcelableconnection: %s",
- CallCapabilities.toString(callCapabilities));
- mAdapter.setCallCapabilities(id, callCapabilities);
+ Log.d(this, "capabilities: parcelableconnection: %s",
+ PhoneCapabilities.toString(capabilities));
+ mAdapter.setCallCapabilities(id, capabilities);
}
@Override
- public void onParentConnectionChanged(Connection c, Connection parent) {
+ public void onVideoProviderChanged(Connection c, Connection.VideoProvider videoProvider) {
String id = mIdByConnection.get(c);
- String parentId = parent == null ? null : mIdByConnection.get(parent);
- mAdapter.setIsConferenced(id, parentId);
- }
-
- @Override
- public void onVideoCallProviderChanged(Connection c, VideoCallProvider videoCallProvider) {
- String id = mIdByConnection.get(c);
- mAdapter.setVideoCallProvider(id, videoCallProvider);
+ mAdapter.setVideoProvider(id, videoProvider);
}
@Override
@@ -472,6 +468,18 @@
Collections.sort(conferenceableCallIds);
mAdapter.setConferenceableConnections(id, conferenceableCallIds);
}
+
+ @Override
+ public void onConferenceChanged(Connection connection, Conference conference) {
+ String id = mIdByConnection.get(connection);
+ if (id != null) {
+ String conferenceId = null;
+ if (conference != null) {
+ conferenceId = mIdByConference.get(conference);
+ }
+ mAdapter.setIsConferenced(id, conferenceId);
+ }
+ }
};
/** {@inheritDoc} */
@@ -487,76 +495,41 @@
*/
private void createConnection(
final PhoneAccountHandle callManagerAccount,
+ final String callId,
final ConnectionRequest request,
boolean isIncoming) {
Log.d(this, "call %s", request);
- final Connection createdConnection;
- if (isIncoming) {
- createdConnection = onCreateIncomingConnection(callManagerAccount, request);
- } else {
- createdConnection = onCreateOutgoingConnection(callManagerAccount, request);
- }
+ Connection createdConnection = isIncoming
+ ? onCreateIncomingConnection(callManagerAccount, request)
+ : onCreateOutgoingConnection(callManagerAccount, request);
- if (createdConnection != null) {
- if (createdConnection.getState() == Connection.State.INITIALIZING) {
- // Wait for the connection to become initialized.
- createdConnection.addConnectionListener(new Connection.Listener() {
- @Override
- public void onStateChanged(Connection c, int state) {
- switch (state) {
- case Connection.State.FAILED:
- Log.d(this, "Connection (%s) failed (%d: %s)", request,
- c.getFailureCode(), c.getFailureMessage());
- Log.d(this, "adapter handleCreateConnectionFailed %s",
- request.getCallId());
- mAdapter.handleCreateConnectionFailed(request, c.getFailureCode(),
- c.getFailureMessage());
- break;
- case Connection.State.CANCELED:
- Log.d(this, "adapter handleCreateConnectionCanceled %s",
- request.getCallId());
- mAdapter.handleCreateConnectionCancelled(request);
- break;
- case Connection.State.INITIALIZING:
- Log.d(this, "State changed to INITIALIZING; ignoring");
- return; // Don't want to stop listening on this state transition.
- default:
- Log.d(this, "Connection created in state %s",
- Connection.stateToString(state));
- connectionCreated(request, createdConnection);
- break;
- }
- c.removeConnectionListener(this);
- }
- });
- } else if (createdConnection.getState() == Connection.State.CANCELED) {
- // Tell telecomm not to attempt any more services.
- mAdapter.handleCreateConnectionCancelled(request);
- } else if (createdConnection.getState() == Connection.State.FAILED) {
- mAdapter.handleCreateConnectionFailed(request, createdConnection.getFailureCode(),
- createdConnection.getFailureMessage());
- } else {
- connectionCreated(request, createdConnection);
- }
- } else {
+ if (createdConnection == null) {
+ Log.d(this, "adapter handleCreateConnectionComplete CANCELED %s", callId);
// Tell telecomm to try a different service.
- Log.d(this, "adapter handleCreateConnectionFailed %s", request.getCallId());
- mAdapter.handleCreateConnectionFailed(request, DisconnectCause.ERROR_UNSPECIFIED, null);
+ createdConnection = Connection.createCanceledConnection();
}
+ connectionCreated(callId, request, createdConnection);
}
- private void connectionCreated(ConnectionRequest request, Connection connection) {
- addConnection(request.getCallId(), connection);
+ private void connectionCreated(
+ String callId,
+ ConnectionRequest request,
+ Connection connection) {
+ if (!(connection instanceof Connection.FailureSignalingConnection)) {
+ addConnection(callId, connection);
+ }
+
Uri handle = connection.getHandle();
String number = handle == null ? "null" : handle.getSchemeSpecificPart();
Log.v(this, "connectionCreated, parcelableconnection: %s, %d, %s",
- toLogSafePhoneNumber(number),
+ Connection.toLogSafePhoneNumber(number),
connection.getState(),
- CallCapabilities.toString(connection.getCallCapabilities()));
+ PhoneCapabilities.toString(connection.getCallCapabilities()));
- Log.d(this, "adapter handleCreateConnectionSuccessful %s", request.getCallId());
- mAdapter.handleCreateConnectionSuccessful(
+ Log.d(this, "adapter handleCreateConnectionSuccessful %s", callId);
+ mAdapter.handleCreateConnectionComplete(
+ callId,
request,
new ParcelableConnection(
request.getAccountHandle(),
@@ -566,9 +539,14 @@
connection.getHandlePresentation(),
connection.getCallerDisplayName(),
connection.getCallerDisplayNamePresentation(),
- connection.getVideoCallProvider() == null ?
- null : connection.getVideoCallProvider().getInterface(),
- connection.getVideoState()));
+ connection.getVideoProvider() == null ?
+ null : connection.getVideoProvider().getInterface(),
+ connection.getVideoState(),
+ connection.isRequestingRingback(),
+ connection.getAudioModeIsVoip(),
+ connection.getStatusHints(),
+ connection.getFailureCode(),
+ connection.getFailureMessage()));
}
private void abort(String callId) {
@@ -601,7 +579,7 @@
findConnectionForAction(callId, "unhold").onUnhold();
}
- private void onAudioStateChanged(String callId, CallAudioState audioState) {
+ private void onAudioStateChanged(String callId, AudioState audioState) {
Log.d(this, "onAudioStateChanged %s %s", callId, audioState);
findConnectionForAction(callId, "onAudioStateChanged").setAudioState(audioState);
}
@@ -616,44 +594,29 @@
findConnectionForAction(callId, "stopDtmfTone").onStopDtmfTone();
}
- private void conference(final String conferenceCallId, String callId) {
- Log.d(this, "conference %s, %s", conferenceCallId, callId);
+ private void conference(String callId1, String callId2) {
+ Log.d(this, "conference %s, %s", callId1, callId2);
- Connection connection = findConnectionForAction(callId, "conference");
- if (connection == getNullConnection()) {
- Log.w(this, "Connection missing in conference request %s.", callId);
+ Connection connection1 = findConnectionForAction(callId1, "conference");
+ if (connection1 == Connection.getNullConnection()) {
+ Log.w(this, "Connection1 missing in conference request %s.", callId1);
return;
}
- onCreateConferenceConnection(conferenceCallId, connection,
- new Response<String, Connection>() {
- /** ${inheritDoc} */
- @Override
- public void onResult(String ignored, Connection... result) {
- Log.d(this, "onCreateConference.Response %s", (Object[]) result);
- if (result != null && result.length == 1) {
- Connection conferenceConnection = result[0];
- if (!mIdByConnection.containsKey(conferenceConnection)) {
- Log.v(this, "sending new conference call %s", conferenceCallId);
- mAdapter.addConferenceCall(conferenceCallId);
- addConnection(conferenceCallId, conferenceConnection);
- }
- }
- }
+ Connection connection2 = findConnectionForAction(callId2, "conference");
+ if (connection2 == Connection.getNullConnection()) {
+ Log.w(this, "Connection2 missing in conference request %s.", callId2);
+ return;
+ }
- /** ${inheritDoc} */
- @Override
- public void onError(String request, int code, String reason) {
- // no-op
- }
- });
+ onConference(connection1, connection2);
}
private void splitFromConference(String callId) {
Log.d(this, "splitFromConference(%s)", callId);
Connection connection = findConnectionForAction(callId, "splitFromConference");
- if (connection == getNullConnection()) {
+ if (connection == Connection.getNullConnection()) {
Log.w(this, "Connection missing in conference request %s.", callId);
return;
}
@@ -661,11 +624,6 @@
// TODO: Find existing conference call and invoke split(connection).
}
- private void swapWithBackgroundCall(String callId) {
- Log.d(this, "swapWithBackgroundCall(%s)", callId);
- findConnectionForAction(callId, "swapWithBackgroundCall").onSwapWithBackgroundCall();
- }
-
private void onPostDialContinue(String callId, boolean proceed) {
Log.d(this, "onPostDialContinue(%s)", callId);
findConnectionForAction(callId, "stopDtmfTone").onPostDialContinue(proceed);
@@ -688,7 +646,8 @@
final List<ComponentName> componentNames,
final List<IBinder> services) {
mHandler.post(new Runnable() {
- @Override public void run() {
+ @Override
+ public void run() {
for (int i = 0; i < componentNames.size() && i < services.size(); i++) {
mRemoteConnectionManager.addConnectionService(
componentNames.get(i),
@@ -703,7 +662,8 @@
@Override
public void onError() {
mHandler.post(new Runnable() {
- @Override public void run() {
+ @Override
+ public void run() {
mAreAccountsInitialized = true;
}
});
@@ -746,6 +706,40 @@
}
/**
+ * Adds a new conference call. When a conference call is created either as a result of an
+ * explicit request via {@link #onConference} or otherwise, the connection service should supply
+ * an instance of {@link Conference} by invoking this method. A conference call provided by this
+ * method will persist until {@link Conference#destroy} is invoked on the conference instance.
+ *
+ * @param conference The new conference object.
+ */
+ public final void addConference(Conference conference) {
+ String id = addConferenceInternal(conference);
+ if (id != null) {
+ List<String> connectionIds = new ArrayList<>(2);
+ for (Connection connection : conference.getConnections()) {
+ if (mIdByConnection.containsKey(connection)) {
+ connectionIds.add(mIdByConnection.get(connection));
+ }
+ }
+ ParcelableConference parcelableConference = new ParcelableConference(
+ conference.getPhoneAccount(),
+ conference.getState(),
+ conference.getCapabilities(),
+ connectionIds);
+ mAdapter.addConferenceCall(id, parcelableConference);
+
+ // Go through any child calls and set the parent.
+ for (Connection connection : conference.getConnections()) {
+ String connectionId = mIdByConnection.get(connection);
+ if (connectionId != null) {
+ mAdapter.setIsConferenced(connectionId, id);
+ }
+ }
+ }
+ }
+
+ /**
* Returns all the active {@code Connection}s for which this {@code ConnectionService}
* has taken responsibility.
*
@@ -792,7 +786,7 @@
* making the connection.
* @param request Details about the outgoing call.
* @return The {@code Connection} object to satisfy this call, or the result of an invocation
- * of {@link Connection#getFailedConnection(int, String)} to not handle the call.
+ * of {@link Connection#createFailedConnection(int, String)} to not handle the call.
*/
public Connection onCreateOutgoingConnection(
PhoneAccountHandle connectionManagerPhoneAccount,
@@ -801,19 +795,14 @@
}
/**
- * Returns a new or existing conference connection when the the user elects to convert the
- * specified connection into a conference call. The specified connection can be any connection
- * which had previously specified itself as conference-capable including both simple connections
- * and connections previously returned from this method.
+ * Conference two specified connections. Invoked when the user has made a request to merge the
+ * specified connections into a conference call. In response, the connection service should
+ * create an instance of {@link Conference} and pass it into {@link #addConference}.
*
- * @param connection The connection from which the user opted to start a conference call.
- * @param token The token to be passed into the response callback.
- * @param callback The callback for providing the potentially-new conference connection.
+ * @param connection1 A connection to merge into a conference call.
+ * @param connection2 A connection to merge into a conference call.
*/
- public void onCreateConferenceConnection(
- String token,
- Connection connection,
- Response<String, Connection> callback) {}
+ public void onConference(Connection connection1, Connection connection2) {}
/**
* Notifies that a connection has been added to this connection service and sent to Telecomm.
@@ -829,29 +818,11 @@
*/
public void onConnectionRemoved(Connection connection) {}
- static String toLogSafePhoneNumber(String number) {
- // For unknown number, log empty string.
- if (number == null) {
- return "";
- }
-
- if (PII_DEBUG) {
- // When PII_DEBUG is true we emit PII.
- return number;
- }
-
- // Do exactly same thing as Uri#toSafeString() does, which will enable us to compare
- // sanitized phone numbers.
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < number.length(); i++) {
- char c = number.charAt(i);
- if (c == '-' || c == '@' || c == '.') {
- builder.append(c);
- } else {
- builder.append('x');
- }
- }
- return builder.toString();
+ /**
+ * @hide
+ */
+ public boolean containsConference(Conference conference) {
+ return mIdByConference.containsKey(conference);
}
private void onAccountsInitialized() {
@@ -866,11 +837,13 @@
mConnectionById.put(callId, connection);
mIdByConnection.put(connection, callId);
connection.addConnectionListener(mConnectionListener);
+ connection.setConnectionService(this);
onConnectionAdded(connection);
}
private void removeConnection(Connection connection) {
String id = mIdByConnection.get(connection);
+ connection.unsetConnectionService(this);
connection.removeConnectionListener(mConnectionListener);
mConnectionById.remove(mIdByConnection.get(connection));
mIdByConnection.remove(connection);
@@ -878,351 +851,36 @@
mAdapter.removeCall(id);
}
+ private String addConferenceInternal(Conference conference) {
+ if (mIdByConference.containsKey(conference)) {
+ Log.w(this, "Re-adding an existing conference: %s.", conference);
+ } else if (conference != null) {
+ String id = UUID.randomUUID().toString();
+ mConferenceById.put(id, conference);
+ mIdByConference.put(conference, id);
+ conference.addListener(mConferenceListener);
+ return id;
+ }
+
+ return null;
+ }
+
+ private void removeConference(Conference conference) {
+ if (mIdByConference.containsKey(conference)) {
+ conference.removeListener(mConferenceListener);
+
+ String id = mIdByConference.get(conference);
+ mConferenceById.remove(id);
+ mIdByConference.remove(conference);
+ mAdapter.removeCall(id);
+ }
+ }
+
private Connection findConnectionForAction(String callId, String action) {
if (mConnectionById.containsKey(callId)) {
return mConnectionById.get(callId);
}
Log.w(this, "%s - Cannot find Connection %s", action, callId);
- return getNullConnection();
- }
-
- private final static synchronized Connection getNullConnection() {
- if (sNullConnection == null) {
- sNullConnection = new Connection() {};
- }
- return sNullConnection;
- }
-
- /**
- * Abstraction for a class which provides video call functionality. This class contains no base
- * implementation for its methods. It is expected that subclasses will override these
- * functions to provide the desired behavior if it is supported.
- */
- public static abstract class VideoCallProvider {
- private static final int MSG_SET_VIDEO_CALL_LISTENER = 1;
- private static final int MSG_SET_CAMERA = 2;
- private static final int MSG_SET_PREVIEW_SURFACE = 3;
- private static final int MSG_SET_DISPLAY_SURFACE = 4;
- private static final int MSG_SET_DEVICE_ORIENTATION = 5;
- private static final int MSG_SET_ZOOM = 6;
- private static final int MSG_SEND_SESSION_MODIFY_REQUEST = 7;
- private static final int MSG_SEND_SESSION_MODIFY_RESPONSE = 8;
- private static final int MSG_REQUEST_CAMERA_CAPABILITIES = 9;
- private static final int MSG_REQUEST_CALL_DATA_USAGE = 10;
- private static final int MSG_SET_PAUSE_IMAGE = 11;
-
- private final VideoCallProviderHandler mMessageHandler = new VideoCallProviderHandler();
- private final VideoCallProviderBinder mBinder;
- private IVideoCallCallback mVideoCallListener;
-
- /**
- * Default handler used to consolidate binder method calls onto a single thread.
- */
- private final class VideoCallProviderHandler extends Handler {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_SET_VIDEO_CALL_LISTENER:
- mVideoCallListener = IVideoCallCallback.Stub.asInterface((IBinder) msg.obj);
- break;
- case MSG_SET_CAMERA:
- onSetCamera((String) msg.obj);
- break;
- case MSG_SET_PREVIEW_SURFACE:
- onSetPreviewSurface((Surface) msg.obj);
- break;
- case MSG_SET_DISPLAY_SURFACE:
- onSetDisplaySurface((Surface) msg.obj);
- break;
- case MSG_SET_DEVICE_ORIENTATION:
- onSetDeviceOrientation(msg.arg1);
- break;
- case MSG_SET_ZOOM:
- onSetZoom((Float) msg.obj);
- break;
- case MSG_SEND_SESSION_MODIFY_REQUEST:
- onSendSessionModifyRequest((VideoCallProfile) msg.obj);
- break;
- case MSG_SEND_SESSION_MODIFY_RESPONSE:
- onSendSessionModifyResponse((VideoCallProfile) msg.obj);
- break;
- case MSG_REQUEST_CAMERA_CAPABILITIES:
- onRequestCameraCapabilities();
- break;
- case MSG_REQUEST_CALL_DATA_USAGE:
- onRequestCallDataUsage();
- break;
- case MSG_SET_PAUSE_IMAGE:
- onSetPauseImage((String) msg.obj);
- break;
- default:
- break;
- }
- }
- }
-
- /**
- * IVideoCallProvider stub implementation.
- */
- private final class VideoCallProviderBinder extends IVideoCallProvider.Stub {
- public void setVideoCallListener(IBinder videoCallListenerBinder) {
- mMessageHandler.obtainMessage(
- MSG_SET_VIDEO_CALL_LISTENER, videoCallListenerBinder).sendToTarget();
- }
-
- public void setCamera(String cameraId) {
- mMessageHandler.obtainMessage(MSG_SET_CAMERA, cameraId).sendToTarget();
- }
-
- public void setPreviewSurface(Surface surface) {
- mMessageHandler.obtainMessage(MSG_SET_PREVIEW_SURFACE, surface).sendToTarget();
- }
-
- public void setDisplaySurface(Surface surface) {
- mMessageHandler.obtainMessage(MSG_SET_DISPLAY_SURFACE, surface).sendToTarget();
- }
-
- public void setDeviceOrientation(int rotation) {
- mMessageHandler.obtainMessage(MSG_SET_DEVICE_ORIENTATION, rotation).sendToTarget();
- }
-
- public void setZoom(float value) {
- mMessageHandler.obtainMessage(MSG_SET_ZOOM, value).sendToTarget();
- }
-
- public void sendSessionModifyRequest(VideoCallProfile requestProfile) {
- mMessageHandler.obtainMessage(
- MSG_SEND_SESSION_MODIFY_REQUEST, requestProfile).sendToTarget();
- }
-
- public void sendSessionModifyResponse(VideoCallProfile responseProfile) {
- mMessageHandler.obtainMessage(
- MSG_SEND_SESSION_MODIFY_RESPONSE, responseProfile).sendToTarget();
- }
-
- public void requestCameraCapabilities() {
- mMessageHandler.obtainMessage(MSG_REQUEST_CAMERA_CAPABILITIES).sendToTarget();
- }
-
- public void requestCallDataUsage() {
- mMessageHandler.obtainMessage(MSG_REQUEST_CALL_DATA_USAGE).sendToTarget();
- }
-
- public void setPauseImage(String uri) {
- mMessageHandler.obtainMessage(MSG_SET_PAUSE_IMAGE, uri).sendToTarget();
- }
- }
-
- public VideoCallProvider() {
- mBinder = new VideoCallProviderBinder();
- }
-
- /**
- * Returns binder object which can be used across IPC methods.
- * @hide
- */
- public final IVideoCallProvider getInterface() {
- return mBinder;
- }
-
- /**
- * Sets the camera to be used for video recording in a video call.
- *
- * @param cameraId The id of the camera.
- */
- public void onSetCamera(String cameraId) {
- // To be implemented by subclass.
- }
-
- /**
- * Sets the surface to be used for displaying a preview of what the user's camera is
- * currently capturing. When video transmission is enabled, this is the video signal which
- * is sent to the remote device.
- *
- * @param surface The surface.
- */
- public void onSetPreviewSurface(Surface surface) {
- // To be implemented by subclass.
- }
-
- /**
- * Sets the surface to be used for displaying the video received from the remote device.
- *
- * @param surface The surface.
- */
- public void onSetDisplaySurface(Surface surface) {
- // To be implemented by subclass.
- }
-
- /**
- * Sets the device orientation, in degrees. Assumes that a standard portrait orientation of
- * the device is 0 degrees.
- *
- * @param rotation The device orientation, in degrees.
- */
- public void onSetDeviceOrientation(int rotation) {
- // To be implemented by subclass.
- }
-
- /**
- * Sets camera zoom ratio.
- *
- * @param value The camera zoom ratio.
- */
- public void onSetZoom(float value) {
- // To be implemented by subclass.
- }
-
- /**
- * Issues a request to modify the properties of the current session. The request is sent to
- * the remote device where it it handled by
- * {@link InCallService.VideoCall.Listener#onSessionModifyRequestReceived}.
- * Some examples of session modification requests: upgrade call from audio to video, downgrade
- * call from video to audio, pause video.
- *
- * @param requestProfile The requested call video properties.
- */
- public void onSendSessionModifyRequest(VideoCallProfile requestProfile) {
- // To be implemented by subclass.
- }
-
- /**
- * Provides a response to a request to change the current call session video
- * properties.
- * This is in response to a request the InCall UI has received via
- * {@link InCallService.VideoCall.Listener#onSessionModifyRequestReceived}.
- * The response is handled on the remove device by
- * {@link InCallService.VideoCall.Listener#onSessionModifyResponseReceived}.
- *
- * @param responseProfile The response call video properties.
- */
- public void onSendSessionModifyResponse(VideoCallProfile responseProfile) {
- // To be implemented by subclass.
- }
-
- /**
- * Issues a request to the video provider to retrieve the camera capabilities.
- * Camera capabilities are reported back to the caller via
- * {@link InCallService.VideoCall.Listener#onCameraCapabilitiesChanged(CallCameraCapabilities)}.
- */
- public void onRequestCameraCapabilities() {
- // To be implemented by subclass.
- }
-
- /**
- * Issues a request to the video telephony framework to retrieve the cumulative data usage for
- * the current call. Data usage is reported back to the caller via
- * {@link InCallService.VideoCall.Listener#onCallDataUsageChanged}.
- */
- public void onRequestCallDataUsage() {
- // To be implemented by subclass.
- }
-
- /**
- * Provides the video telephony framework with the URI of an image to be displayed to remote
- * devices when the video signal is paused.
- *
- * @param uri URI of image to display.
- */
- public void onSetPauseImage(String uri) {
- // To be implemented by subclass.
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * @param videoCallProfile The requested video call profile.
- */
- public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.receiveSessionModifyRequest(videoCallProfile);
- } catch (RemoteException ignored) {
- }
- }
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * @param status Status of the session modify request. Valid values are
- * {@link InCallService.VideoCall#SESSION_MODIFY_REQUEST_SUCCESS},
- * {@link InCallService.VideoCall#SESSION_MODIFY_REQUEST_FAIL},
- * {@link InCallService.VideoCall#SESSION_MODIFY_REQUEST_INVALID}
- * @param requestedProfile The original request which was sent to the remote device.
- * @param responseProfile The actual profile changes made by the remote device.
- */
- public void receiveSessionModifyResponse(
- int status, VideoCallProfile requestedProfile, VideoCallProfile responseProfile) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.receiveSessionModifyResponse(
- status, requestedProfile, responseProfile);
- } catch (RemoteException ignored) {
- }
- }
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * Valid values are: {@link InCallService.VideoCall#SESSION_EVENT_RX_PAUSE},
- * {@link InCallService.VideoCall#SESSION_EVENT_RX_RESUME},
- * {@link InCallService.VideoCall#SESSION_EVENT_TX_START},
- * {@link InCallService.VideoCall#SESSION_EVENT_TX_STOP}
- *
- * @param event The event.
- */
- public void handleCallSessionEvent(int event) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.handleCallSessionEvent(event);
- } catch (RemoteException ignored) {
- }
- }
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * @param width The updated peer video width.
- * @param height The updated peer video height.
- */
- public void changePeerDimensions(int width, int height) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.changePeerDimensions(width, height);
- } catch (RemoteException ignored) {
- }
- }
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * @param dataUsage The updated data usage.
- */
- public void changeCallDataUsage(int dataUsage) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.changeCallDataUsage(dataUsage);
- } catch (RemoteException ignored) {
- }
- }
- }
-
- /**
- * Invokes callback method defined in {@link InCallService.VideoCall.Listener}.
- *
- * @param callCameraCapabilities The changed camera capabilities.
- */
- public void changeCameraCapabilities(CallCameraCapabilities callCameraCapabilities) {
- if (mVideoCallListener != null) {
- try {
- mVideoCallListener.changeCameraCapabilities(callCameraCapabilities);
- } catch (RemoteException ignored) {
- }
- }
- }
+ return Connection.getNullConnection();
}
}
diff --git a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java b/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
index 9fd3a97..41c6360 100644
--- a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
@@ -17,18 +17,13 @@
package android.telecomm;
import android.app.PendingIntent;
-import android.content.ComponentName;
import android.net.Uri;
-import android.os.IBinder;
import android.os.IBinder.DeathRecipient;
import android.os.RemoteException;
-import com.android.internal.telecomm.IConnectionService;
import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoCallProvider;
import com.android.internal.telecomm.RemoteServiceCallback;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -41,8 +36,13 @@
* @hide
*/
final class ConnectionServiceAdapter implements DeathRecipient {
+ /**
+ * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
+ * load factor before resizing, 1 means we only expect a single thread to
+ * access the map so make only a single shard
+ */
private final Set<IConnectionServiceAdapter> mAdapters = Collections.newSetFromMap(
- new ConcurrentHashMap<IConnectionServiceAdapter, Boolean>(2));
+ new ConcurrentHashMap<IConnectionServiceAdapter, Boolean>(8, 0.9f, 1));
ConnectionServiceAdapter() {
}
@@ -58,7 +58,7 @@
}
void removeAdapter(IConnectionServiceAdapter adapter) {
- if (mAdapters.remove(adapter)) {
+ if (adapter != null && mAdapters.remove(adapter)) {
adapter.asBinder().unlinkToDeath(this, 0);
}
}
@@ -76,29 +76,13 @@
}
}
- void handleCreateConnectionSuccessful(
- ConnectionRequest request, ParcelableConnection connection) {
+ void handleCreateConnectionComplete(
+ String id,
+ ConnectionRequest request,
+ ParcelableConnection connection) {
for (IConnectionServiceAdapter adapter : mAdapters) {
try {
- adapter.handleCreateConnectionSuccessful(request, connection);
- } catch (RemoteException e) {
- }
- }
- }
-
- void handleCreateConnectionFailed(ConnectionRequest request, int errorCode, String errorMsg) {
- for (IConnectionServiceAdapter adapter : mAdapters) {
- try {
- adapter.handleCreateConnectionFailed(request, errorCode, errorMsg);
- } catch (RemoteException e) {
- }
- }
- }
-
- void handleCreateConnectionCancelled(ConnectionRequest request) {
- for (IConnectionServiceAdapter adapter : mAdapters) {
- try {
- adapter.handleCreateConnectionCancelled(request);
+ adapter.handleCreateConnectionComplete(id, request, connection);
} catch (RemoteException e) {
}
}
@@ -248,10 +232,10 @@
*
* @param callId The unique ID of the conference call.
*/
- void addConferenceCall(String callId) {
+ void addConferenceCall(String callId, ParcelableConference parcelableConference) {
for (IConnectionServiceAdapter adapter : mAdapters) {
try {
- adapter.addConferenceCall(callId);
+ adapter.addConferenceCall(callId, parcelableConference);
} catch (RemoteException ignored) {
}
}
@@ -275,15 +259,15 @@
* Sets the call video provider for a call.
*
* @param callId The unique ID of the call to set with the given call video provider.
- * @param videoCallProvider The call video provider instance to set on the call.
+ * @param videoProvider The call video provider instance to set on the call.
*/
- void setVideoCallProvider(
- String callId, ConnectionService.VideoCallProvider videoCallProvider) {
+ void setVideoProvider(
+ String callId, Connection.VideoProvider videoProvider) {
for (IConnectionServiceAdapter adapter : mAdapters) {
try {
- adapter.setVideoCallProvider(
+ adapter.setVideoProvider(
callId,
- videoCallProvider == null ? null : videoCallProvider.getInterface());
+ videoProvider == null ? null : videoProvider.getInterface());
} catch (RemoteException e) {
}
}
@@ -334,10 +318,10 @@
/**
* Sets the video state associated with a call.
*
- * Valid values: {@link android.telecomm.VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},
- * {@link android.telecomm.VideoCallProfile#VIDEO_STATE_BIDIRECTIONAL},
- * {@link android.telecomm.VideoCallProfile#VIDEO_STATE_TX_ENABLED},
- * {@link android.telecomm.VideoCallProfile#VIDEO_STATE_RX_ENABLED}.
+ * Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#TX_ENABLED},
+ * {@link VideoProfile.VideoState#RX_ENABLED}.
*
* @param callId The unique ID of the call to set the video state for.
* @param videoState The video state.
diff --git a/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java
index 1685bd7..0e1c516 100644
--- a/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java
@@ -24,7 +24,7 @@
import com.android.internal.os.SomeArgs;
import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoCallProvider;
+import com.android.internal.telecomm.IVideoProvider;
import com.android.internal.telecomm.RemoteServiceCallback;
import java.util.List;
@@ -38,29 +38,27 @@
* @hide
*/
final class ConnectionServiceAdapterServant {
- private static final int MSG_HANDLE_CREATE_CONNECTION_SUCCESSFUL = 1;
- private static final int MSG_HANDLE_CREATE_CONNECTION_FAILED = 2;
- private static final int MSG_HANDLE_CREATE_CONNECTION_CANCELLED = 3;
- private static final int MSG_SET_ACTIVE = 4;
- private static final int MSG_SET_RINGING = 5;
- private static final int MSG_SET_DIALING = 6;
- private static final int MSG_SET_DISCONNECTED = 7;
- private static final int MSG_SET_ON_HOLD = 8;
- private static final int MSG_SET_REQUESTING_RINGBACK = 9;
- private static final int MSG_SET_CALL_CAPABILITIES = 10;
- private static final int MSG_SET_IS_CONFERENCED = 11;
- private static final int MSG_ADD_CONFERENCE_CALL = 12;
- private static final int MSG_REMOVE_CALL = 13;
- private static final int MSG_ON_POST_DIAL_WAIT = 14;
- private static final int MSG_QUERY_REMOTE_CALL_SERVICES = 15;
- private static final int MSG_SET_VIDEO_STATE = 16;
- private static final int MSG_SET_VIDEO_CALL_PROVIDER = 17;
- private static final int MSG_SET_AUDIO_MODE_IS_VOIP = 18;
- private static final int MSG_SET_STATUS_HINTS = 19;
- private static final int MSG_SET_HANDLE = 20;
- private static final int MSG_SET_CALLER_DISPLAY_NAME = 21;
- private static final int MSG_START_ACTIVITY_FROM_IN_CALL = 22;
- private static final int MSG_SET_CONFERENCEABLE_CONNECTIONS = 23;
+ private static final int MSG_HANDLE_CREATE_CONNECTION_COMPLETE = 1;
+ private static final int MSG_SET_ACTIVE = 2;
+ private static final int MSG_SET_RINGING = 3;
+ private static final int MSG_SET_DIALING = 4;
+ private static final int MSG_SET_DISCONNECTED = 5;
+ private static final int MSG_SET_ON_HOLD = 6;
+ private static final int MSG_SET_REQUESTING_RINGBACK = 7;
+ private static final int MSG_SET_CALL_CAPABILITIES = 8;
+ private static final int MSG_SET_IS_CONFERENCED = 9;
+ private static final int MSG_ADD_CONFERENCE_CALL = 10;
+ private static final int MSG_REMOVE_CALL = 11;
+ private static final int MSG_ON_POST_DIAL_WAIT = 12;
+ private static final int MSG_QUERY_REMOTE_CALL_SERVICES = 13;
+ private static final int MSG_SET_VIDEO_STATE = 14;
+ private static final int MSG_SET_VIDEO_CALL_PROVIDER = 15;
+ private static final int MSG_SET_AUDIO_MODE_IS_VOIP = 16;
+ private static final int MSG_SET_STATUS_HINTS = 17;
+ private static final int MSG_SET_HANDLE = 18;
+ private static final int MSG_SET_CALLER_DISPLAY_NAME = 19;
+ private static final int MSG_START_ACTIVITY_FROM_IN_CALL = 20;
+ private static final int MSG_SET_CONFERENCEABLE_CONNECTIONS = 21;
private final IConnectionServiceAdapter mDelegate;
@@ -76,33 +74,18 @@
// Internal method defined to centralize handling of RemoteException
private void internalHandleMessage(Message msg) throws RemoteException {
switch (msg.what) {
- case MSG_HANDLE_CREATE_CONNECTION_SUCCESSFUL: {
+ case MSG_HANDLE_CREATE_CONNECTION_COMPLETE: {
SomeArgs args = (SomeArgs) msg.obj;
try {
- mDelegate.handleCreateConnectionSuccessful(
- (ConnectionRequest) args.arg1,
- (ParcelableConnection) args.arg2);
+ mDelegate.handleCreateConnectionComplete(
+ (String) args.arg1,
+ (ConnectionRequest) args.arg2,
+ (ParcelableConnection) args.arg3);
} finally {
args.recycle();
}
break;
}
- case MSG_HANDLE_CREATE_CONNECTION_FAILED: {
- SomeArgs args = (SomeArgs) msg.obj;
- try {
- mDelegate.handleCreateConnectionFailed(
- (ConnectionRequest) args.arg1,
- args.argi1,
- (String) args.arg2);
- } finally {
- args.recycle();
- }
- break;
- }
- case MSG_HANDLE_CREATE_CONNECTION_CANCELLED: {
- mDelegate.handleCreateConnectionCancelled((ConnectionRequest) msg.obj);
- break;
- }
case MSG_SET_ACTIVE:
mDelegate.setActive((String) msg.obj);
break;
@@ -140,9 +123,16 @@
}
break;
}
- case MSG_ADD_CONFERENCE_CALL:
- mDelegate.addConferenceCall((String) msg.obj);
+ case MSG_ADD_CONFERENCE_CALL: {
+ SomeArgs args = (SomeArgs) msg.obj;
+ try {
+ mDelegate.addConferenceCall(
+ (String) args.arg1, (ParcelableConference) args.arg2);
+ } finally {
+ args.recycle();
+ }
break;
+ }
case MSG_REMOVE_CALL:
mDelegate.removeCall((String) msg.obj);
break;
@@ -164,8 +154,8 @@
case MSG_SET_VIDEO_CALL_PROVIDER: {
SomeArgs args = (SomeArgs) msg.obj;
try {
- mDelegate.setVideoCallProvider((String) args.arg1,
- (IVideoCallProvider) args.arg2);
+ mDelegate.setVideoProvider((String) args.arg1,
+ (IVideoProvider) args.arg2);
} finally {
args.recycle();
}
@@ -228,27 +218,15 @@
private final IConnectionServiceAdapter mStub = new IConnectionServiceAdapter.Stub() {
@Override
- public void handleCreateConnectionSuccessful(
- ConnectionRequest request, ParcelableConnection connection) {
+ public void handleCreateConnectionComplete(
+ String id,
+ ConnectionRequest request,
+ ParcelableConnection connection) {
SomeArgs args = SomeArgs.obtain();
- args.arg1 = request;
- args.arg2 = connection;
- mHandler.obtainMessage(MSG_HANDLE_CREATE_CONNECTION_SUCCESSFUL, args).sendToTarget();
- }
-
- @Override
- public void handleCreateConnectionFailed(
- ConnectionRequest request, int errorCode, String errorMessage) {
- SomeArgs args = SomeArgs.obtain();
- args.arg1 = request;
- args.argi1 = errorCode;
- args.arg2 = errorMessage;
- mHandler.obtainMessage(MSG_HANDLE_CREATE_CONNECTION_FAILED, args).sendToTarget();
- }
-
- @Override
- public void handleCreateConnectionCancelled(ConnectionRequest request) {
- mHandler.obtainMessage(MSG_HANDLE_CREATE_CONNECTION_CANCELLED, request).sendToTarget();
+ args.arg1 = id;
+ args.arg2 = request;
+ args.arg3 = connection;
+ mHandler.obtainMessage(MSG_HANDLE_CREATE_CONNECTION_COMPLETE, args).sendToTarget();
}
@Override
@@ -302,8 +280,11 @@
}
@Override
- public void addConferenceCall(String callId) {
- mHandler.obtainMessage(MSG_ADD_CONFERENCE_CALL, callId).sendToTarget();
+ public void addConferenceCall(String callId, ParcelableConference parcelableConference) {
+ SomeArgs args = SomeArgs.obtain();
+ args.arg1 = callId;
+ args.arg2 = parcelableConference;
+ mHandler.obtainMessage(MSG_ADD_CONFERENCE_CALL, args).sendToTarget();
}
@Override
@@ -330,11 +311,10 @@
}
@Override
- public void setVideoCallProvider(
- String connectionId, IVideoCallProvider videoCallProvider) {
+ public void setVideoProvider(String connectionId, IVideoProvider videoProvider) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = connectionId;
- args.arg2 = videoCallProvider;
+ args.arg2 = videoProvider;
mHandler.obtainMessage(MSG_SET_VIDEO_CALL_PROVIDER, args).sendToTarget();
}
diff --git a/telecomm/java/android/telecomm/GatewayInfo.aidl b/telecomm/java/android/telecomm/GatewayInfo.aidl
index d59e9b4..bd81014 100644
--- a/telecomm/java/android/telecomm/GatewayInfo.aidl
+++ b/telecomm/java/android/telecomm/GatewayInfo.aidl
@@ -16,4 +16,7 @@
package android.telecomm;
+/**
+ * {@hide}
+ */
parcelable GatewayInfo;
diff --git a/telecomm/java/android/telecomm/InCallAdapter.java b/telecomm/java/android/telecomm/InCallAdapter.java
index 08eb03a..80f7b57 100644
--- a/telecomm/java/android/telecomm/InCallAdapter.java
+++ b/telecomm/java/android/telecomm/InCallAdapter.java
@@ -28,6 +28,10 @@
* given call IDs to execute commands such as {@link #answerCall} for incoming calls or
* {@link #disconnectCall} for active calls the user would like to end. Some commands are only
* appropriate for calls in certain states; please consult each method for such limitations.
+ * <p>
+ * The adapter will stop functioning when there are no more calls.
+ *
+ * {@hide}
*/
public final class InCallAdapter {
private final IInCallAdapter mAdapter;
@@ -115,7 +119,7 @@
}
/**
- * Sets the audio route (speaker, bluetooth, etc...). See {@link CallAudioState}.
+ * Sets the audio route (speaker, bluetooth, etc...). See {@link AudioState}.
*
* @param route The audio route to use.
*/
@@ -237,19 +241,6 @@
}
/**
- * Swap this call with a background call. This is used for calls that don't support hold,
- * e.g. CDMA.
- *
- * @param callId The unique ID of the call.
- */
- public void swapWithBackgroundCall(String callId) {
- try {
- mAdapter.swapWithBackgroundCall(callId);
- } catch (RemoteException ignored) {
- }
- }
-
- /**
* Instructs Telecomm to turn the proximity sensor on.
*/
public void turnProximitySensorOn() {
diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java
index b275809..794ec41 100644
--- a/telecomm/java/android/telecomm/InCallService.java
+++ b/telecomm/java/android/telecomm/InCallService.java
@@ -16,6 +16,8 @@
package android.telecomm;
+import android.annotation.SystemApi;
+import android.annotation.SdkConstant;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Intent;
@@ -35,9 +37,18 @@
* This service is implemented by any app that wishes to provide the user-interface for managing
* phone calls. Telecomm binds to this service while there exists a live (active or incoming) call,
* and uses it to notify the in-call app of any live and and recently disconnected calls.
- * TODO: What happens if two or more apps on a given device implement this interface?
+ *
+ * {@hide}
*/
+@SystemApi
public abstract class InCallService extends Service {
+
+ /**
+ * The {@link Intent} that must be declared as handled by the service.
+ */
+ @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
+ public static final String SERVICE_INTERFACE = "android.telecomm.InCallService";
+
private static final int MSG_SET_IN_CALL_ADAPTER = 1;
private static final int MSG_ADD_CALL = 2;
private static final int MSG_UPDATE_CALL = 3;
@@ -73,7 +84,7 @@
break;
}
case MSG_ON_AUDIO_STATE_CHANGED:
- mPhone.internalAudioStateChanged((CallAudioState) msg.obj);
+ mPhone.internalAudioStateChanged((AudioState) msg.obj);
break;
case MSG_BRING_TO_FOREGROUND:
mPhone.internalBringToForeground(msg.arg1 == 1);
@@ -124,7 +135,7 @@
}
@Override
- public void onAudioStateChanged(CallAudioState audioState) {
+ public void onAudioStateChanged(AudioState audioState) {
mHandler.obtainMessage(MSG_ON_AUDIO_STATE_CHANGED, audioState).sendToTarget();
}
@@ -191,56 +202,6 @@
public static abstract class VideoCall {
/**
- * Video is not being received (no protocol pause was issued).
- */
- public static final int SESSION_EVENT_RX_PAUSE = 1;
-
- /**
- * Video reception has resumed after a SESSION_EVENT_RX_PAUSE.
- */
- public static final int SESSION_EVENT_RX_RESUME = 2;
-
- /**
- * Video transmission has begun. This occurs after a negotiated start of video transmission
- * when the underlying protocol has actually begun transmitting video to the remote party.
- */
- public static final int SESSION_EVENT_TX_START = 3;
-
- /**
- * Video transmission has stopped. This occurs after a negotiated stop of video transmission
- * when the underlying protocol has actually stopped transmitting video to the remote party.
- */
- public static final int SESSION_EVENT_TX_STOP = 4;
-
- /**
- * A camera failure has occurred for the selected camera. The In-Call UI can use this as a
- * cue to inform the user the camera is not available.
- */
- public static final int SESSION_EVENT_CAMERA_FAILURE = 5;
-
- /**
- * Issued after {@code SESSION_EVENT_CAMERA_FAILURE} when the camera is once again ready for
- * operation. The In-Call UI can use this as a cue to inform the user that the camera has
- * become available again.
- */
- public static final int SESSION_EVENT_CAMERA_READY = 6;
-
- /**
- * Session modify request was successful.
- */
- public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1;
-
- /**
- * Session modify request failed.
- */
- public static final int SESSION_MODIFY_REQUEST_FAIL = 2;
-
- /**
- * Session modify request ignored due to invalid parameters.
- */
- public static final int SESSION_MODIFY_REQUEST_INVALID = 3;
-
- /**
* Sets a listener to invoke callback methods in the InCallUI after performing video
* telephony actions.
*
@@ -295,7 +256,7 @@
*
* @param requestProfile The requested call video properties.
*/
- public abstract void sendSessionModifyRequest(VideoCallProfile requestProfile);
+ public abstract void sendSessionModifyRequest(VideoProfile requestProfile);
/**
* Provides a response to a request to change the current call session video
@@ -307,12 +268,12 @@
*
* @param responseProfile The response call video properties.
*/
- public abstract void sendSessionModifyResponse(VideoCallProfile responseProfile);
+ public abstract void sendSessionModifyResponse(VideoProfile responseProfile);
/**
* Issues a request to the video provider to retrieve the camera capabilities.
* Camera capabilities are reported back to the caller via
- * {@link VideoCall.Listener#onCameraCapabilitiesChanged(CallCameraCapabilities)}.
+ * {@link VideoCall.Listener#onCameraCapabilitiesChanged(CameraCapabilities)}.
*/
public abstract void requestCameraCapabilities();
@@ -338,43 +299,44 @@
/**
* Called when a session modification request is received from the remote device.
* The remote request is sent via
- * {@link ConnectionService.VideoCallProvider#onSendSessionModifyRequest}. The InCall UI
+ * {@link Connection.VideoProvider#onSendSessionModifyRequest}. The InCall UI
* is responsible for potentially prompting the user whether they wish to accept the new
* call profile (e.g. prompt user if they wish to accept an upgrade from an audio to a
* video call) and should call
- * {@link ConnectionService.VideoCallProvider#onSendSessionModifyResponse} to indicate
+ * {@link Connection.VideoProvider#onSendSessionModifyResponse} to indicate
* the video settings the user has agreed to.
*
- * @param videoCallProfile The requested video call profile.
+ * @param videoProfile The requested video call profile.
*/
- public abstract void onSessionModifyRequestReceived(VideoCallProfile videoCallProfile);
+ public abstract void onSessionModifyRequestReceived(VideoProfile videoProfile);
/**
* Called when a response to a session modification request is received from the remote
* device. The remote InCall UI sends the response using
- * {@link ConnectionService.VideoCallProvider#onSendSessionModifyResponse}.
+ * {@link Connection.VideoProvider#onSendSessionModifyResponse}.
*
* @param status Status of the session modify request. Valid values are
- * {@link VideoCall#SESSION_MODIFY_REQUEST_SUCCESS},
- * {@link VideoCall#SESSION_MODIFY_REQUEST_FAIL},
- * {@link VideoCall#SESSION_MODIFY_REQUEST_INVALID}
+ * {@link Connection.VideoProvider#SESSION_MODIFY_REQUEST_SUCCESS},
+ * {@link Connection.VideoProvider#SESSION_MODIFY_REQUEST_FAIL},
+ * {@link Connection.VideoProvider#SESSION_MODIFY_REQUEST_INVALID}
* @param requestedProfile The original request which was sent to the remote device.
* @param responseProfile The actual profile changes made by the remote device.
*/
public abstract void onSessionModifyResponseReceived(int status,
- VideoCallProfile requestedProfile, VideoCallProfile responseProfile);
+ VideoProfile requestedProfile, VideoProfile responseProfile);
/**
* Handles events related to the current session which the client may wish to handle.
* These are separate from requested changes to the session due to the underlying
* protocol or connection.
*
- * Valid values are: {@link VideoCall#SESSION_EVENT_RX_PAUSE},
- * {@link VideoCall#SESSION_EVENT_RX_RESUME},
- * {@link VideoCall#SESSION_EVENT_TX_START},
- * {@link VideoCall#SESSION_EVENT_TX_STOP},
- * {@link VideoCall#SESSION_EVENT_CAMERA_FAILURE},
- * {@link VideoCall#SESSION_EVENT_CAMERA_READY}
+ * Valid values are:
+ * {@link Connection.VideoProvider#SESSION_EVENT_RX_PAUSE},
+ * {@link Connection.VideoProvider#SESSION_EVENT_RX_RESUME},
+ * {@link Connection.VideoProvider#SESSION_EVENT_TX_START},
+ * {@link Connection.VideoProvider#SESSION_EVENT_TX_STOP},
+ * {@link Connection.VideoProvider#SESSION_EVENT_CAMERA_FAILURE},
+ * {@link Connection.VideoProvider#SESSION_EVENT_CAMERA_READY}
*
* @param event The event.
*/
@@ -399,10 +361,10 @@
/**
* Handles a change in camera capabilities.
*
- * @param callCameraCapabilities The changed camera capabilities.
+ * @param cameraCapabilities The changed camera capabilities.
*/
public abstract void onCameraCapabilitiesChanged(
- CallCameraCapabilities callCameraCapabilities);
+ CameraCapabilities cameraCapabilities);
}
}
}
diff --git a/telecomm/java/android/telecomm/ParcelableCall.aidl b/telecomm/java/android/telecomm/ParcelableCall.aidl
index 8c96638..18691d2 100644
--- a/telecomm/java/android/telecomm/ParcelableCall.aidl
+++ b/telecomm/java/android/telecomm/ParcelableCall.aidl
@@ -16,4 +16,7 @@
package android.telecomm;
+/**
+ * {@hide}
+ */
parcelable ParcelableCall;
diff --git a/telecomm/java/android/telecomm/ParcelableCall.java b/telecomm/java/android/telecomm/ParcelableCall.java
index 360e768..8098b94 100644
--- a/telecomm/java/android/telecomm/ParcelableCall.java
+++ b/telecomm/java/android/telecomm/ParcelableCall.java
@@ -17,24 +17,25 @@
package android.telecomm;
import android.net.Uri;
+import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
import android.telephony.DisconnectCause;
-import com.android.internal.telecomm.IVideoCallProvider;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import com.android.internal.telecomm.IVideoProvider;
+
/**
* Information about a call that is used between InCallService and Telecomm.
* @hide
*/
public final class ParcelableCall implements Parcelable {
private final String mId;
- private final CallState mState;
+ private final int mState;
private final int mDisconnectCauseCode;
private final String mDisconnectCauseMsg;
private final List<String> mCannedSmsResponses;
@@ -46,17 +47,18 @@
private final int mCallerDisplayNamePresentation;
private final GatewayInfo mGatewayInfo;
private final PhoneAccountHandle mAccountHandle;
- private final IVideoCallProvider mVideoCallProvider;
+ private final IVideoProvider mVideoCallProvider;
private InCallService.VideoCall mVideoCall;
private final String mParentCallId;
private final List<String> mChildCallIds;
private final StatusHints mStatusHints;
private final int mVideoState;
private final List<String> mConferenceableCallIds;
+ private final Bundle mExtras;
public ParcelableCall(
String id,
- CallState state,
+ int state,
int disconnectCauseCode,
String disconnectCauseMsg,
List<String> cannedSmsResponses,
@@ -68,12 +70,13 @@
int callerDisplayNamePresentation,
GatewayInfo gatewayInfo,
PhoneAccountHandle accountHandle,
- IVideoCallProvider videoCallProvider,
+ IVideoProvider videoCallProvider,
String parentCallId,
List<String> childCallIds,
StatusHints statusHints,
int videoState,
- List<String> conferenceableCallIds) {
+ List<String> conferenceableCallIds,
+ Bundle extras) {
mId = id;
mState = state;
mDisconnectCauseCode = disconnectCauseCode;
@@ -93,6 +96,7 @@
mStatusHints = statusHints;
mVideoState = videoState;
mConferenceableCallIds = Collections.unmodifiableList(conferenceableCallIds);
+ mExtras = extras;
}
/** The unique ID of the call. */
@@ -101,7 +105,7 @@
}
/** The current state of the call. */
- public CallState getState() {
+ public int getState() {
return mState;
}
@@ -143,7 +147,7 @@
return mHandle;
}
- /** The {@link CallPropertyPresentation} which controls how the handle is shown. */
+ /** The {@link PropertyPresentation} which controls how the handle is shown. */
public int getHandlePresentation() {
return mHandlePresentation;
}
@@ -153,7 +157,7 @@
return mCallerDisplayName;
}
- /** The {@link CallPropertyPresentation} which controls how the caller display name is shown. */
+ /** The {@link PropertyPresentation} which controls how the caller display name is shown. */
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
}
@@ -220,6 +224,15 @@
return mVideoState;
}
+ /**
+ * Any extras to pass with the call
+ *
+ * @return a bundle of extras
+ */
+ public Bundle getExtras() {
+ return mExtras;
+ }
+
/** Responsible for creating ParcelableCall objects for deserialized Parcels. */
public static final Parcelable.Creator<ParcelableCall> CREATOR =
new Parcelable.Creator<ParcelableCall> () {
@@ -227,7 +240,7 @@
public ParcelableCall createFromParcel(Parcel source) {
ClassLoader classLoader = ParcelableCall.class.getClassLoader();
String id = source.readString();
- CallState state = CallState.valueOf(source.readString());
+ int state = source.readInt();
int disconnectCauseCode = source.readInt();
String disconnectCauseMsg = source.readString();
List<String> cannedSmsResponses = new ArrayList<>();
@@ -240,8 +253,8 @@
int callerDisplayNamePresentation = source.readInt();
GatewayInfo gatewayInfo = source.readParcelable(classLoader);
PhoneAccountHandle accountHandle = source.readParcelable(classLoader);
- IVideoCallProvider videoCallProvider =
- IVideoCallProvider.Stub.asInterface(source.readStrongBinder());
+ IVideoProvider videoCallProvider =
+ IVideoProvider.Stub.asInterface(source.readStrongBinder());
String parentCallId = source.readString();
List<String> childCallIds = new ArrayList<>();
source.readList(childCallIds, classLoader);
@@ -249,11 +262,12 @@
int videoState = source.readInt();
List<String> conferenceableCallIds = new ArrayList<>();
source.readList(conferenceableCallIds, classLoader);
+ Bundle extras = source.readParcelable(classLoader);
return new ParcelableCall(id, state, disconnectCauseCode, disconnectCauseMsg,
cannedSmsResponses, capabilities, connectTimeMillis, handle, handlePresentation,
callerDisplayName, callerDisplayNamePresentation, gatewayInfo,
accountHandle, videoCallProvider, parentCallId, childCallIds, statusHints,
- videoState, conferenceableCallIds);
+ videoState, conferenceableCallIds, extras);
}
@Override
@@ -272,7 +286,7 @@
@Override
public void writeToParcel(Parcel destination, int flags) {
destination.writeString(mId);
- destination.writeString(mState.name());
+ destination.writeInt(mState);
destination.writeInt(mDisconnectCauseCode);
destination.writeString(mDisconnectCauseMsg);
destination.writeList(mCannedSmsResponses);
@@ -291,6 +305,7 @@
destination.writeParcelable(mStatusHints, 0);
destination.writeInt(mVideoState);
destination.writeList(mConferenceableCallIds);
+ destination.writeParcelable(mExtras, 0);
}
@Override
diff --git a/telecomm/java/android/telecomm/CallAudioState.aidl b/telecomm/java/android/telecomm/ParcelableConference.aidl
similarity index 94%
rename from telecomm/java/android/telecomm/CallAudioState.aidl
rename to telecomm/java/android/telecomm/ParcelableConference.aidl
index ae64567..a260085 100644
--- a/telecomm/java/android/telecomm/CallAudioState.aidl
+++ b/telecomm/java/android/telecomm/ParcelableConference.aidl
@@ -16,4 +16,4 @@
package android.telecomm;
-parcelable CallAudioState;
+parcelable ParcelableConference;
diff --git a/telecomm/java/android/telecomm/ParcelableConference.java b/telecomm/java/android/telecomm/ParcelableConference.java
new file mode 100644
index 0000000..b279861
--- /dev/null
+++ b/telecomm/java/android/telecomm/ParcelableConference.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2014, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.telecomm;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A parcelable representation of a conference connection.
+ * @hide
+ */
+public final class ParcelableConference implements Parcelable {
+
+ private PhoneAccountHandle mPhoneAccount;
+ private int mState;
+ private int mCapabilities;
+ private List<String> mConnectionIds;
+
+ public ParcelableConference(
+ PhoneAccountHandle phoneAccount,
+ int state,
+ int capabilities,
+ List<String> connectionIds) {
+ mPhoneAccount = phoneAccount;
+ mState = state;
+ mCapabilities = capabilities;
+ mConnectionIds = connectionIds;
+ }
+
+ @Override
+ public String toString() {
+ return (new StringBuffer())
+ .append("account: ")
+ .append(mPhoneAccount)
+ .append(", state: ")
+ .append(Connection.stateToString(mState))
+ .append(", capabilities: ")
+ .append(PhoneCapabilities.toString(mCapabilities))
+ .append(", children: ")
+ .append(mConnectionIds)
+ .toString();
+ }
+
+ public PhoneAccountHandle getPhoneAccount() {
+ return mPhoneAccount;
+ }
+
+ public int getState() {
+ return mState;
+ }
+
+ public int getCapabilities() {
+ return mCapabilities;
+ }
+
+ public List<String> getConnectionIds() {
+ return mConnectionIds;
+ }
+
+ public static final Parcelable.Creator<ParcelableConference> CREATOR =
+ new Parcelable.Creator<ParcelableConference> () {
+ @Override
+ public ParcelableConference createFromParcel(Parcel source) {
+ ClassLoader classLoader = ParcelableConference.class.getClassLoader();
+ PhoneAccountHandle phoneAccount = source.readParcelable(classLoader);
+ int state = source.readInt();
+ int capabilities = source.readInt();
+ List<String> connectionIds = new ArrayList<>(2);
+ source.readList(connectionIds, classLoader);
+
+ return new ParcelableConference(phoneAccount, state, capabilities, connectionIds);
+ }
+
+ @Override
+ public ParcelableConference[] newArray(int size) {
+ return new ParcelableConference[size];
+ }
+ };
+
+ /** {@inheritDoc} */
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /** Writes ParcelableConference object into a Parcel. */
+ @Override
+ public void writeToParcel(Parcel destination, int flags) {
+ destination.writeParcelable(mPhoneAccount, 0);
+ destination.writeInt(mState);
+ destination.writeInt(mCapabilities);
+ destination.writeList(mConnectionIds);
+ }
+}
diff --git a/telecomm/java/android/telecomm/ParcelableConnection.aidl b/telecomm/java/android/telecomm/ParcelableConnection.aidl
index e3c3bd2..143c5a6 100644
--- a/telecomm/java/android/telecomm/ParcelableConnection.aidl
+++ b/telecomm/java/android/telecomm/ParcelableConnection.aidl
@@ -16,4 +16,7 @@
package android.telecomm;
+/**
+ * {@hide}
+ */
parcelable ParcelableConnection;
diff --git a/telecomm/java/android/telecomm/ParcelableConnection.java b/telecomm/java/android/telecomm/ParcelableConnection.java
index 2f79004..30ff5be 100644
--- a/telecomm/java/android/telecomm/ParcelableConnection.java
+++ b/telecomm/java/android/telecomm/ParcelableConnection.java
@@ -20,7 +20,7 @@
import android.os.Parcel;
import android.os.Parcelable;
-import com.android.internal.telecomm.IVideoCallProvider;
+import com.android.internal.telecomm.IVideoProvider;
/**
* Information about a connection that is used between Telecomm and the ConnectionService.
@@ -36,8 +36,13 @@
private int mHandlePresentation;
private String mCallerDisplayName;
private int mCallerDisplayNamePresentation;
- private IVideoCallProvider mVideoCallProvider;
+ private IVideoProvider mVideoProvider;
private int mVideoState;
+ private boolean mRequestingRingback;
+ private boolean mAudioModeIsVoip;
+ private StatusHints mStatusHints;
+ private int mFailureCode;
+ private String mFailureMessage;
/** @hide */
public ParcelableConnection(
@@ -48,8 +53,13 @@
int handlePresentation,
String callerDisplayName,
int callerDisplayNamePresentation,
- IVideoCallProvider videoCallProvider,
- int videoState) {
+ IVideoProvider videoProvider,
+ int videoState,
+ boolean requestingRingback,
+ boolean audioModeIsVoip,
+ StatusHints statusHints,
+ int failureCode,
+ String failureMessage) {
mPhoneAccount = phoneAccount;
mState = state;
mCapabilities = capabilities;
@@ -57,8 +67,13 @@
mHandlePresentation = handlePresentation;
mCallerDisplayName = callerDisplayName;
mCallerDisplayNamePresentation = callerDisplayNamePresentation;
- mVideoCallProvider = videoCallProvider;
+ mVideoProvider = videoProvider;
mVideoState = videoState;
+ mRequestingRingback = requestingRingback;
+ mAudioModeIsVoip = audioModeIsVoip;
+ mStatusHints = statusHints;
+ mFailureCode = failureCode;
+ mFailureMessage = failureMessage;
}
public PhoneAccountHandle getPhoneAccount() {
@@ -90,14 +105,34 @@
return mCallerDisplayNamePresentation;
}
- public IVideoCallProvider getVideoCallProvider() {
- return mVideoCallProvider;
+ public IVideoProvider getVideoProvider() {
+ return mVideoProvider;
}
public int getVideoState() {
return mVideoState;
}
+ public boolean isRequestingRingback() {
+ return mRequestingRingback;
+ }
+
+ public boolean getAudioModeIsVoip() {
+ return mAudioModeIsVoip;
+ }
+
+ public final StatusHints getStatusHints() {
+ return mStatusHints;
+ }
+
+ public final int getFailureCode() {
+ return mFailureCode;
+ }
+
+ public final String getFailureMessage() {
+ return mFailureMessage;
+ }
+
@Override
public String toString() {
return new StringBuilder()
@@ -106,7 +141,7 @@
.append(", state:")
.append(mState)
.append(", capabilities:")
- .append(CallCapabilities.toString(mCapabilities))
+ .append(PhoneCapabilities.toString(mCapabilities))
.toString();
}
@@ -123,9 +158,14 @@
int handlePresentation = source.readInt();
String callerDisplayName = source.readString();
int callerDisplayNamePresentation = source.readInt();
- IVideoCallProvider videoCallProvider =
- IVideoCallProvider.Stub.asInterface(source.readStrongBinder());
+ IVideoProvider videoCallProvider =
+ IVideoProvider.Stub.asInterface(source.readStrongBinder());
int videoState = source.readInt();
+ boolean requestingRingback = source.readByte() == 1;
+ boolean audioModeIsVoip = source.readByte() == 1;
+ StatusHints statusHints = source.readParcelable(classLoader);
+ int disconnectCauseCode = source.readInt();
+ String disconnectCauseMessage = source.readString();
return new ParcelableConnection(
phoneAccount,
@@ -136,7 +176,12 @@
callerDisplayName,
callerDisplayNamePresentation,
videoCallProvider,
- videoState);
+ videoState,
+ requestingRingback,
+ audioModeIsVoip,
+ statusHints,
+ disconnectCauseCode,
+ disconnectCauseMessage);
}
@Override
@@ -162,7 +207,12 @@
destination.writeString(mCallerDisplayName);
destination.writeInt(mCallerDisplayNamePresentation);
destination.writeStrongBinder(
- mVideoCallProvider != null ? mVideoCallProvider.asBinder() : null);
+ mVideoProvider != null ? mVideoProvider.asBinder() : null);
destination.writeInt(mVideoState);
+ destination.writeByte((byte) (mRequestingRingback ? 1 : 0));
+ destination.writeByte((byte) (mAudioModeIsVoip ? 1 : 0));
+ destination.writeParcelable(mStatusHints, 0);
+ destination.writeInt(mFailureCode);
+ destination.writeString(mFailureMessage);
}
}
diff --git a/telecomm/java/android/telecomm/Phone.java b/telecomm/java/android/telecomm/Phone.java
index 4ad572d..e125342 100644
--- a/telecomm/java/android/telecomm/Phone.java
+++ b/telecomm/java/android/telecomm/Phone.java
@@ -16,6 +16,7 @@
package android.telecomm;
+import android.annotation.SystemApi;
import android.app.PendingIntent;
import android.util.ArrayMap;
@@ -24,10 +25,14 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* A unified virtual device providing a means of voice (and other) communication on a device.
+ *
+ * {@hide}
*/
+@SystemApi
public final class Phone {
public abstract static class Listener {
@@ -35,9 +40,9 @@
* Called when the audio state changes.
*
* @param phone The {@code Phone} calling this method.
- * @param audioState The new {@link CallAudioState}.
+ * @param audioState The new {@link AudioState}.
*/
- public void onAudioStateChanged(Phone phone, CallAudioState audioState) { }
+ public void onAudioStateChanged(Phone phone, AudioState audioState) { }
/**
* Called to bring the in-call screen to the foreground. The in-call experience should
@@ -85,9 +90,9 @@
private final InCallAdapter mInCallAdapter;
- private CallAudioState mAudioState;
+ private AudioState mAudioState;
- private final List<Listener> mListeners = new ArrayList<>();
+ private final List<Listener> mListeners = new CopyOnWriteArrayList<>();
/** {@hide} */
Phone(InCallAdapter adapter) {
@@ -129,10 +134,10 @@
}
/** {@hide} */
- final void internalAudioStateChanged(CallAudioState callAudioState) {
- if (!Objects.equals(mAudioState, callAudioState)) {
- mAudioState = callAudioState;
- fireAudioStateChanged(callAudioState);
+ final void internalAudioStateChanged(AudioState audioState) {
+ if (!Objects.equals(mAudioState, audioState)) {
+ mAudioState = audioState;
+ fireAudioStateChanged(audioState);
}
}
@@ -169,7 +174,9 @@
* @param listener A {@code Listener} object.
*/
public final void removeListener(Listener listener) {
- mListeners.remove(listener);
+ if (listener != null) {
+ mListeners.remove(listener);
+ }
}
/**
@@ -229,35 +236,31 @@
*
* @return An object encapsulating the audio state.
*/
- public final CallAudioState getAudioState() {
+ public final AudioState getAudioState() {
return mAudioState;
}
private void fireCallAdded(Call call) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onCallAdded(this, call);
+ for (Listener listener : mListeners) {
+ listener.onCallAdded(this, call);
}
}
private void fireCallRemoved(Call call) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onCallRemoved(this, call);
+ for (Listener listener : mListeners) {
+ listener.onCallRemoved(this, call);
}
}
- private void fireAudioStateChanged(CallAudioState audioState) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onAudioStateChanged(this, audioState);
+ private void fireAudioStateChanged(AudioState audioState) {
+ for (Listener listener : mListeners) {
+ listener.onAudioStateChanged(this, audioState);
}
}
private void fireBringToForeground(boolean showDialpad) {
- Listener[] listeners = mListeners.toArray(new Listener[mListeners.size()]);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].onBringToForeground(this, showDialpad);
+ for (Listener listener : mListeners) {
+ listener.onBringToForeground(this, showDialpad);
}
}
diff --git a/telecomm/java/android/telecomm/PhoneAccount.java b/telecomm/java/android/telecomm/PhoneAccount.java
index 0fea7ba..411f48c 100644
--- a/telecomm/java/android/telecomm/PhoneAccount.java
+++ b/telecomm/java/android/telecomm/PhoneAccount.java
@@ -27,7 +27,8 @@
import java.util.MissingResourceException;
/**
- * Provides user interface description information for a {@code PhoneAccount}.
+ * Describes a distinct account, line of service or call placement method that the system
+ * can use to place phone calls.
*/
public class PhoneAccount implements Parcelable {
@@ -37,9 +38,9 @@
* will be allowed to manage phone calls including using its own proprietary phone-call
* implementation (like VoIP calling) to make calls instead of the telephony stack.
* <p>
- * When a user opts to place a call using the SIM-based telephony stack, the connection-service
- * associated with this phone-account will be attempted first if the user has explicitly
- * selected it to be used as the default connection manager.
+ * When a user opts to place a call using the SIM-based telephony stack, the
+ * {@link ConnectionService} associated with this {@code PhoneAccount} will be attempted first
+ * if the user has explicitly selected it to be used as the default connection manager.
* <p>
* See {@link #getCapabilities}
*/
@@ -53,21 +54,25 @@
* calls from or use the built-in telephony stack to place its calls.
* <p>
* See {@link #getCapabilities}
- *
+ * <p>
* {@hide}
*/
public static final int CAPABILITY_CALL_PROVIDER = 0x2;
/**
- * Flag indicating that this {@code PhoneAccount} represents built-in PSTN SIM
+ * Flag indicating that this {@code PhoneAccount} represents a built-in PSTN SIM
* subscription.
* <p>
- * Only the android framework can set this capability on a phone account.
+ * Only the Android framework can register a {@code PhoneAccount} having this capability.
+ * <p>
+ * See {@link #getCapabilities}
*/
public static final int CAPABILITY_SIM_SUBSCRIPTION = 0x4;
/**
- * Flag indicating that this {@code PhoneAccount} is capable of video calling.
+ * Flag indicating that this {@code PhoneAccount} is capable of placing video calls.
+ * <p>
+ * See {@link #getCapabilities}
*/
public static final int CAPABILITY_VIDEO_CALLING = 0x8;
@@ -79,7 +84,65 @@
private final CharSequence mLabel;
private final CharSequence mShortDescription;
- public PhoneAccount(
+ public static class Builder {
+ private PhoneAccountHandle mAccountHandle;
+ private Uri mHandle;
+ private String mSubscriptionNumber;
+ private int mCapabilities;
+ private int mIconResId;
+ private CharSequence mLabel;
+ private CharSequence mShortDescription;
+
+ private Builder() {}
+
+ public Builder withAccountHandle(PhoneAccountHandle value) {
+ this.mAccountHandle = value;
+ return this;
+ }
+
+ public Builder withHandle(Uri value) {
+ this.mHandle = value;
+ return this;
+ }
+
+ public Builder withSubscriptionNumber(String value) {
+ this.mSubscriptionNumber = value;
+ return this;
+ }
+
+ public Builder withCapabilities(int value) {
+ this.mCapabilities = value;
+ return this;
+ }
+
+ public Builder withIconResId(int value) {
+ this.mIconResId = value;
+ return this;
+ }
+
+ public Builder withLabel(CharSequence value) {
+ this.mLabel = value;
+ return this;
+ }
+
+ public Builder withShortDescription(CharSequence value) {
+ this.mShortDescription = value;
+ return this;
+ }
+
+ public PhoneAccount build() {
+ return new PhoneAccount(
+ mAccountHandle,
+ mHandle,
+ mSubscriptionNumber,
+ mCapabilities,
+ mIconResId,
+ mLabel,
+ mShortDescription);
+ }
+ }
+
+ private PhoneAccount(
PhoneAccountHandle account,
Uri handle,
String subscriptionNumber,
@@ -96,8 +159,10 @@
mShortDescription = shortDescription;
}
+ public static Builder builder() { return new Builder(); }
+
/**
- * The {@code PhoneAccountHandle} to which this metadata pertains.
+ * The unique identifier of this {@code PhoneAccount}.
*
* @return A {@code PhoneAccountHandle}.
*/
@@ -118,9 +183,15 @@
}
/**
- * The subscription number associated with the underlying transport. This may differ from the
- * {@link #getHandle()} number; for example, if the number used to talk to the network is not
- * the same number that will be on the remote party's caller ID display.
+ * The raw callback number used for this {@code PhoneAccount}, as distinct from
+ * {@link #getHandle()}. For the majority of {@code PhoneAccount}s this should be registered
+ * as {@code null}. It is used by the system for SIM-based {@code PhoneAccount} registration
+ * where {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(String, String)}
+ * or {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(long, String, String)}
+ * has been used to alter the callback number.
+ * <p>
+ * TODO: Should this also be a URI, for consistency? Should it be called the
+ * "subscription handle"?
*
* @return The subscription number, suitable for display to the user.
*/
@@ -147,7 +218,7 @@
}
/**
- * A short paragraph describing a {@code PhoneAccount}.
+ * A short paragraph describing this {@code PhoneAccount}.
*
* @return A description for this {@code PhoneAccount}.
*/
@@ -183,7 +254,7 @@
return null;
}
try {
- return packageContext.getResources().getDrawable(resId);
+ return packageContext.getDrawable(resId);
} catch (NotFoundException|MissingResourceException e) {
Log.e(this, e, "Cannot find icon %d in package %s",
resId, mAccountHandle.getComponentName().getPackageName());
diff --git a/telecomm/java/android/telecomm/PhoneAccountHandle.java b/telecomm/java/android/telecomm/PhoneAccountHandle.java
index f14766c..04cd2b0 100644
--- a/telecomm/java/android/telecomm/PhoneAccountHandle.java
+++ b/telecomm/java/android/telecomm/PhoneAccountHandle.java
@@ -23,8 +23,7 @@
import java.util.Objects;
/**
- * Represents a distinct account, line of service or call placement method that
- * the system can use to place phone calls.
+ * The unique identifier for a {@link PhoneAccount}.
*/
public class PhoneAccountHandle implements Parcelable {
private ComponentName mComponentName;
@@ -48,10 +47,18 @@
}
/**
- * A unique identifier for this {@code PhoneAccountHandle}, generated by and meaningful to the
- * {@link android.telecomm.ConnectionService} that created it.
+ * A string that uniquely distinguishes this particular {@code PhoneAccountHandle} from all the
+ * others supported by the {@link ConnectionService} that created it.
+ * <p>
+ * A {@code ConnectionService} must select identifiers that are stable for the lifetime of
+ * their users' relationship with their service, across many Android devices. For example, a
+ * good set of identifiers might be the email addresses with which with users registered for
+ * their accounts with a particular service. Depending on how a service chooses to operate,
+ * a bad set of identifiers might be an increasing series of integers
+ * ({@code 0}, {@code 1}, {@code 2}, ...) that are generated locally on each phone and could
+ * collide with values generated on other phones or after a data wipe of a given phone.
*
- * @return A unique identifier for this {@code PhoneAccountHandle}.
+ * @return A service-specific unique identifier for this {@code PhoneAccountHandle}.
*/
public String getId() {
return mId;
diff --git a/telecomm/java/android/telecomm/CallCapabilities.java b/telecomm/java/android/telecomm/PhoneCapabilities.java
similarity index 92%
rename from telecomm/java/android/telecomm/CallCapabilities.java
rename to telecomm/java/android/telecomm/PhoneCapabilities.java
index e64fe80..45168d5 100644
--- a/telecomm/java/android/telecomm/CallCapabilities.java
+++ b/telecomm/java/android/telecomm/PhoneCapabilities.java
@@ -16,8 +16,12 @@
package android.telecomm;
-/** Defines actions a call currently supports. */
-public final class CallCapabilities {
+/**
+ * Defines capabilities a phone call can support, such as conference calling and video telephony.
+ * Also defines properties of a phone call, such as whether it is using VoLTE technology.
+
+ */
+public final class PhoneCapabilities {
/** Call can currently be put on hold or unheld. */
public static final int HOLD = 0x00000001;
@@ -98,5 +102,5 @@
return builder.toString();
}
- private CallCapabilities() {}
+ private PhoneCapabilities() {}
}
diff --git a/telecomm/java/android/telecomm/CallPropertyPresentation.java b/telecomm/java/android/telecomm/PropertyPresentation.java
similarity index 88%
rename from telecomm/java/android/telecomm/CallPropertyPresentation.java
rename to telecomm/java/android/telecomm/PropertyPresentation.java
index 319e565..fe97b3d 100644
--- a/telecomm/java/android/telecomm/CallPropertyPresentation.java
+++ b/telecomm/java/android/telecomm/PropertyPresentation.java
@@ -16,8 +16,10 @@
package android.telecomm;
-/** Defines how numbers and names are displayed in caller id. */
-public class CallPropertyPresentation {
+/**
+ * Defines how properties such as phone numbers and names are displayed to the user.
+ */
+public class PropertyPresentation {
/** Property is displayed normally. */
public static final int ALLOWED = 1;
diff --git a/telecomm/java/android/telecomm/RemoteConnection.java b/telecomm/java/android/telecomm/RemoteConnection.java
index a8636d4..30cfdde 100644
--- a/telecomm/java/android/telecomm/RemoteConnection.java
+++ b/telecomm/java/android/telecomm/RemoteConnection.java
@@ -16,13 +16,13 @@
package android.telecomm;
+import com.android.internal.telecomm.IConnectionService;
+
import android.app.PendingIntent;
import android.net.Uri;
import android.os.RemoteException;
import android.telephony.DisconnectCause;
-import com.android.internal.telecomm.IConnectionService;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -31,7 +31,11 @@
import java.util.concurrent.ConcurrentHashMap;
/**
- * RemoteConnection object used by RemoteConnectionService.
+ * A connection provided to a {@link ConnectionService} by another {@code ConnectionService}
+ * running in a different process.
+ *
+ * @see ConnectionService#createRemoteOutgoingConnection(PhoneAccountHandle, ConnectionRequest)
+ * @see ConnectionService#createRemoteIncomingConnection(PhoneAccountHandle, ConnectionRequest)
*/
public final class RemoteConnection {
@@ -100,7 +104,7 @@
* Invoked when the post-dial sequence in the outgoing {@code Connection} has reached a
* pause character. This causes the post-dial signals to stop pending user confirmation. An
* implementation should present this choice to the user and invoke
- * {@link #postDialContinue(boolean)} when the user makes the choice.
+ * {@link RemoteConnection#postDialContinue(boolean)} when the user makes the choice.
*
* @param connection The {@code RemoteConnection} invoking this method.
* @param remainingPostDialSequence The post-dial characters that remain to be sent.
@@ -131,7 +135,7 @@
*
* @param connection The {@code RemoteConnection} invoking this method.
* @param handle The new handle of the {@code RemoteConnection}.
- * @param presentation The {@link CallPropertyPresentation} which controls how the
+ * @param presentation The {@link PropertyPresentation} which controls how the
* handle is shown.
*/
public void onHandleChanged(RemoteConnection connection, Uri handle, int presentation) {}
@@ -142,7 +146,7 @@
*
* @param connection The {@code RemoteConnection} invoking this method.
* @param callerDisplayName The new caller display name of the {@code RemoteConnection}.
- * @param presentation The {@link CallPropertyPresentation} which controls how the
+ * @param presentation The {@link PropertyPresentation} which controls how the
* caller display name is shown.
*/
public void onCallerDisplayNameChanged(
@@ -180,11 +184,16 @@
private IConnectionService mConnectionService;
private final String mConnectionId;
+ /**
+ * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
+ * load factor before resizing, 1 means we only expect a single thread to
+ * access the map so make only a single shard
+ */
private final Set<Listener> mListeners = Collections.newSetFromMap(
- new ConcurrentHashMap<Listener, Boolean>(2));
+ new ConcurrentHashMap<Listener, Boolean>(8, 0.9f, 1));
private final Set<RemoteConnection> mConferenceableConnections = new HashSet<>();
- private int mState = Connection.State.NEW;
+ private int mState = Connection.STATE_NEW;
private int mDisconnectCauseCode = DisconnectCause.NOT_VALID;
private String mDisconnectCauseMessage;
private boolean mRequestingRingback;
@@ -203,12 +212,14 @@
/**
* @hide
*/
- RemoteConnection(IConnectionService connectionService, ConnectionRequest request) {
+ RemoteConnection(
+ String id,
+ IConnectionService connectionService,
+ ConnectionRequest request) {
+ mConnectionId = id;
mConnectionService = connectionService;
- mConnectionId = request == null ? "NULL" : request.getCallId();
-
mConnected = true;
- mState = Connection.State.INITIALIZING;
+ mState = Connection.STATE_INITIALIZING;
}
/**
@@ -219,12 +230,12 @@
* @param failureCode
* @param failureMessage
*/
- private RemoteConnection(int failureCode, String failureMessage) {
- this(null, null);
+ RemoteConnection(int failureCode, String failureMessage) {
+ this("NULL", null, null);
mConnected = false;
- mState = Connection.State.FAILED;
- mFailureCode = failureCode;
- mFailureMessage = failureMessage;
+ mState = Connection.STATE_DISCONNECTED;
+ mFailureCode = DisconnectCause.OUTGOING_FAILURE;
+ mFailureMessage = failureMessage + " original code = " + failureCode;
}
/**
@@ -242,7 +253,9 @@
* @param listener A {@code Listener}.
*/
public void removeListener(Listener listener) {
- mListeners.remove(listener);
+ if (listener != null) {
+ mListeners.remove(listener);
+ }
}
/**
@@ -271,7 +284,7 @@
}
/**
- * @return For a {@link Connection.State#DISCONNECTED} {@code RemoteConnection}, the
+ * @return For a {@link Connection#STATE_DISCONNECTED} {@code RemoteConnection}, the
* disconnect cause expressed as a code chosen from among those declared in
* {@link DisconnectCause}.
*/
@@ -280,7 +293,7 @@
}
/**
- * @return For a {@link Connection.State#DISCONNECTED} {@code RemoteConnection}, an optional
+ * @return For a {@link Connection#STATE_DISCONNECTED} {@code RemoteConnection}, an optional
* reason for disconnection expressed as a free text message.
*/
public String getDisconnectCauseMessage() {
@@ -289,7 +302,7 @@
/**
* @return A bitmask of the capabilities of the {@code RemoteConnection}, as defined in
- * {@link CallCapabilities}.
+ * {@link PhoneCapabilities}.
*/
public int getCallCapabilities() {
return mCallCapabilities;
@@ -303,7 +316,7 @@
}
/**
- * @return The current {@link android.telecomm.StatusHints} of this {@code RemoteConnection},
+ * @return The current {@link StatusHints} of this {@code RemoteConnection},
* or {@code null} if none have been set.
*/
public StatusHints getStatusHints() {
@@ -320,7 +333,7 @@
/**
* @return The presentation requirements for the handle. See
- * {@link android.telecomm.CallPropertyPresentation} for valid values.
+ * {@link PropertyPresentation} for valid values.
*/
public int getHandlePresentation() {
return mHandlePresentation;
@@ -335,7 +348,7 @@
/**
* @return The presentation requirements for the caller display name. See
- * {@link android.telecomm.CallPropertyPresentation} for valid values.
+ * {@link PropertyPresentation} for valid values.
*/
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
@@ -343,7 +356,7 @@
/**
* @return The video state of the {@code RemoteConnection}. See
- * {@link VideoCallProfile.VideoState}.
+ * {@link VideoProfile.VideoState}.
*/
public int getVideoState() {
return mVideoState;
@@ -385,7 +398,7 @@
}
/**
- * Instructs this {@link Connection.State#RINGING} {@code RemoteConnection} to answer.
+ * Instructs this {@link Connection#STATE_RINGING} {@code RemoteConnection} to answer.
* @param videoState The video state in which to answer the call.
*/
public void answer(int videoState) {
@@ -398,7 +411,7 @@
}
/**
- * Instructs this {@link Connection.State#RINGING} {@code RemoteConnection} to reject.
+ * Instructs this {@link Connection#STATE_RINGING} {@code RemoteConnection} to reject.
*/
public void reject() {
try {
@@ -422,7 +435,7 @@
}
/**
- * Instructs this {@link Connection.State#HOLDING} call to release from hold.
+ * Instructs this {@link Connection#STATE_HOLDING} call to release from hold.
*/
public void unhold() {
try {
@@ -510,24 +523,11 @@
}
/**
- * Instructs this {@code RemoteConnection} to swap itself with an existing background call,
- * if one such call exists.
- */
- public void swapWithBackgroundCall() {
- try {
- if (mConnected) {
- mConnectionService.swapWithBackgroundCall(mConnectionId);
- }
- } catch (RemoteException ignored) {
- }
- }
-
- /**
* Set the audio state of this {@code RemoteConnection}.
*
* @param state The audio state of this {@code RemoteConnection}.
*/
- public void setAudioState(CallAudioState state) {
+ public void setAudioState(AudioState state) {
try {
if (mConnected) {
mConnectionService.onAudioStateChanged(mConnectionId, state);
@@ -552,8 +552,8 @@
* @hide
*/
void setDisconnected(int cause, String message) {
- if (mState != Connection.State.DISCONNECTED) {
- mState = Connection.State.DISCONNECTED;
+ if (mState != Connection.STATE_DISCONNECTED) {
+ mState = Connection.STATE_DISCONNECTED;
mDisconnectCauseCode = cause;
mDisconnectCauseMessage = message;
@@ -591,15 +591,14 @@
void setDestroyed() {
if (!mListeners.isEmpty()) {
// Make sure that the listeners are notified that the call is destroyed first.
- if (mState != Connection.State.DISCONNECTED) {
+ if (mState != Connection.STATE_DISCONNECTED) {
setDisconnected(DisconnectCause.ERROR_UNSPECIFIED, "Connection destroyed.");
}
- Set<Listener> listeners = new HashSet<Listener>(mListeners);
- mListeners.clear();
- for (Listener l : listeners) {
+ for (Listener l : mListeners) {
l.onDestroyed(this);
}
+ mListeners.clear();
mConnected = false;
}
@@ -676,8 +675,9 @@
}
/**
- * Create a RemoteConnection which is in the {@link Connection.State#FAILED} state. Attempting
- * to use it for anything will almost certainly result in bad things happening. Do not do this.
+ * Create a RemoteConnection represents a failure, and which will be in
+ * {@link Connection#STATE_DISCONNECTED}. Attempting to use it for anything will almost
+ * certainly result in bad things happening. Do not do this.
*
* @return a failed {@link RemoteConnection}
*
diff --git a/telecomm/java/android/telecomm/RemoteConnectionService.java b/telecomm/java/android/telecomm/RemoteConnectionService.java
index 95b62ba..541df4e 100644
--- a/telecomm/java/android/telecomm/RemoteConnectionService.java
+++ b/telecomm/java/android/telecomm/RemoteConnectionService.java
@@ -11,7 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- R* limitations under the License.
+ * limitations under the License.
*/
package android.telecomm;
@@ -25,7 +25,7 @@
import com.android.internal.telecomm.IConnectionService;
import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoCallProvider;
+import com.android.internal.telecomm.IVideoProvider;
import com.android.internal.telecomm.RemoteServiceCallback;
import java.util.HashMap;
@@ -43,16 +43,20 @@
*/
final class RemoteConnectionService {
- private static final RemoteConnection NULL_CONNECTION = new RemoteConnection(null, null);
+ private static final RemoteConnection
+ NULL_CONNECTION = new RemoteConnection("NULL", null, null);
private final IConnectionServiceAdapter mServantDelegate = new IConnectionServiceAdapter() {
@Override
- public void handleCreateConnectionSuccessful(ConnectionRequest request,
+ public void handleCreateConnectionComplete(
+ String id,
+ ConnectionRequest request,
ParcelableConnection parcel) {
- RemoteConnection connection = findConnectionForAction(
- request.getCallId(), "handleCreateConnectionSuccessful");
+ RemoteConnection connection =
+ findConnectionForAction(id, "handleCreateConnectionSuccessful");
if (connection != NULL_CONNECTION && mPendingConnections.contains(connection)) {
mPendingConnections.remove(connection);
+ // Unconditionally initialize the connection ...
connection.setState(parcel.getState());
connection.setCallCapabilities(parcel.getCapabilities());
connection.setHandle(
@@ -61,41 +65,30 @@
parcel.getCallerDisplayName(),
parcel.getCallerDisplayNamePresentation());
// TODO: Do we need to support video providers for remote connections?
+ if (connection.getState() == Connection.STATE_DISCONNECTED) {
+ // ... then, if it was created in a disconnected state, that indicates
+ // failure on the providing end, so immediately mark it destroyed
+ connection.setDestroyed();
+ }
}
}
@Override
- public void handleCreateConnectionFailed(ConnectionRequest request, int errorCode,
- String errorMessage) {
- // TODO: How do we propagate the failure codes?
- findConnectionForAction(
- request.getCallId(), "handleCreateConnectionFailed")
- .setDestroyed();
- }
-
- @Override
- public void handleCreateConnectionCancelled(ConnectionRequest request) {
- findConnectionForAction(
- request.getCallId(), "handleCreateConnectionCancelled")
- .setDestroyed();
- }
-
- @Override
public void setActive(String callId) {
findConnectionForAction(callId, "setActive")
- .setState(Connection.State.ACTIVE);
+ .setState(Connection.STATE_ACTIVE);
}
@Override
public void setRinging(String callId) {
findConnectionForAction(callId, "setRinging")
- .setState(Connection.State.RINGING);
+ .setState(Connection.STATE_RINGING);
}
@Override
public void setDialing(String callId) {
findConnectionForAction(callId, "setDialing")
- .setState(Connection.State.DIALING);
+ .setState(Connection.STATE_DIALING);
}
@Override
@@ -108,7 +101,7 @@
@Override
public void setOnHold(String callId) {
findConnectionForAction(callId, "setOnHold")
- .setState(Connection.State.HOLDING);
+ .setState(Connection.STATE_HOLDING);
}
@Override
@@ -129,7 +122,7 @@
}
@Override
- public void addConferenceCall(String callId) {
+ public void addConferenceCall(String callId, ParcelableConference parcelableConference) {
// not supported for remote connections.
}
@@ -151,8 +144,7 @@
}
@Override
- public void setVideoCallProvider(String callId,
- IVideoCallProvider videoCallProvider) {
+ public void setVideoProvider(String callId, IVideoProvider videoProvider) {
// not supported for remote connections.
}
@@ -244,9 +236,9 @@
PhoneAccountHandle connectionManagerPhoneAccount,
ConnectionRequest request,
boolean isIncoming) {
+ final String id = UUID.randomUUID().toString();
final ConnectionRequest newRequest = new ConnectionRequest(
request.getAccountHandle(),
- UUID.randomUUID().toString(),
request.getHandle(),
request.getHandlePresentation(),
request.getExtras(),
@@ -256,17 +248,18 @@
mConnectionService.addConnectionServiceAdapter(mServant.getStub());
}
RemoteConnection connection =
- new RemoteConnection(mConnectionService, newRequest);
+ new RemoteConnection(id, mConnectionService, newRequest);
mPendingConnections.add(connection);
- mConnectionById.put(newRequest.getCallId(), connection);
+ mConnectionById.put(id, connection);
mConnectionService.createConnection(
connectionManagerPhoneAccount,
+ id,
newRequest,
isIncoming);
connection.addListener(new RemoteConnection.Listener() {
@Override
public void onDestroyed(RemoteConnection connection) {
- mConnectionById.remove(newRequest.getCallId());
+ mConnectionById.remove(id);
if (mConnectionById.isEmpty()) {
try {
mConnectionService.removeConnectionServiceAdapter(mServant.getStub());
@@ -277,11 +270,13 @@
});
return connection;
} catch (RemoteException e) {
- return RemoteConnection.failure(DisconnectCause.ERROR_UNSPECIFIED, e.toString());
+ return RemoteConnection
+ .failure(DisconnectCause.ERROR_UNSPECIFIED, e.toString());
}
}
- private RemoteConnection findConnectionForAction(String callId, String action) {
+ private RemoteConnection findConnectionForAction(
+ String callId, String action) {
if (mConnectionById.containsKey(callId)) {
return mConnectionById.get(callId);
}
diff --git a/telecomm/java/android/telecomm/Response.java b/telecomm/java/android/telecomm/Response.java
index 13c0702..f879756 100644
--- a/telecomm/java/android/telecomm/Response.java
+++ b/telecomm/java/android/telecomm/Response.java
@@ -17,7 +17,10 @@
package android.telecomm;
/**
- * Used to inform a client of asynchronously returned results.
+ * <strong>OBSOLETE</strong> Used to inform a client of asynchronously returned results.
+ * <p>
+ * <strong>TODO:</strong> Remove onCreateConferenceConnection() async method
+ * then delete this interface.
*/
public interface Response<IN, OUT> {
diff --git a/telecomm/java/android/telecomm/SimpleResponse.java b/telecomm/java/android/telecomm/SimpleResponse.java
deleted file mode 100644
index 8e84adb..0000000
--- a/telecomm/java/android/telecomm/SimpleResponse.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.telecomm;
-
-/**
- * Used to inform a client of asynchronously returned results.
- */
-public interface SimpleResponse<IN, OUT> {
-
- /**
- * Provide a set of results.
- *
- * @param request The original request.
- * @param result The results.
- */
- void onResult(IN request, OUT result);
-
- /**
- * Indicates the inability to provide results.
- *
- * @param request The original request.
- */
- void onError(IN request);
-}
diff --git a/telecomm/java/android/telecomm/StatusHints.java b/telecomm/java/android/telecomm/StatusHints.java
index 496a38c..f7c4f2f 100644
--- a/telecomm/java/android/telecomm/StatusHints.java
+++ b/telecomm/java/android/telecomm/StatusHints.java
@@ -20,11 +20,9 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.DisplayMetrics;
import java.util.MissingResourceException;
import java.util.Objects;
@@ -36,13 +34,13 @@
private final ComponentName mComponentName;
private final CharSequence mLabel;
- private final int mIconId;
+ private final int mIconResId;
private final Bundle mExtras;
- public StatusHints(ComponentName componentName, CharSequence label, int iconId, Bundle extras) {
+ public StatusHints(ComponentName componentName, CharSequence label, int iconResId, Bundle extras) {
mComponentName = componentName;
mLabel = label;
- mIconId = iconId;
+ mIconResId = iconResId;
mExtras = extras;
}
@@ -61,17 +59,19 @@
}
/**
- * @return The icon resource identifier.
+ * The icon resource ID for the icon to show.
+ *
+ * @return A resource ID.
*/
- public int getIconId() {
- return mIconId;
+ public int getIconResId() {
+ return mIconResId;
}
/**
* @return An icon displayed in the in-call UI.
*/
public Drawable getIcon(Context context) {
- return getIcon(context, mIconId);
+ return getIcon(context, mIconResId);
}
/**
@@ -90,7 +90,7 @@
public void writeToParcel(Parcel out, int flags) {
out.writeParcelable(mComponentName, flags);
out.writeCharSequence(mLabel);
- out.writeInt(mIconId);
+ out.writeInt(mIconResId);
out.writeParcelable(mExtras, 0);
}
@@ -108,8 +108,8 @@
private StatusHints(Parcel in) {
mComponentName = in.readParcelable(getClass().getClassLoader());
mLabel = in.readCharSequence();
- mIconId = in.readInt();
- mExtras = (Bundle) in.readParcelable(getClass().getClassLoader());
+ mIconResId = in.readInt();
+ mExtras = in.readParcelable(getClass().getClassLoader());
}
private Drawable getIcon(Context context, int resId) {
@@ -121,7 +121,7 @@
return null;
}
try {
- return packageContext.getResources().getDrawable(resId);
+ return packageContext.getDrawable(resId);
} catch (MissingResourceException e) {
Log.e(this, e, "Cannot find icon %d in package %s",
resId, mComponentName.getPackageName());
@@ -135,7 +135,7 @@
StatusHints otherHints = (StatusHints) other;
return Objects.equals(otherHints.getComponentName(), getComponentName()) &&
Objects.equals(otherHints.getLabel(), getLabel()) &&
- otherHints.getIconId() == getIconId() &&
+ otherHints.getIconResId() == getIconResId() &&
Objects.equals(otherHints.getExtras(), getExtras());
}
return false;
@@ -143,7 +143,7 @@
@Override
public int hashCode() {
- return Objects.hashCode(mComponentName) + Objects.hashCode(mLabel) + mIconId +
+ return Objects.hashCode(mComponentName) + Objects.hashCode(mLabel) + mIconResId +
Objects.hashCode(mExtras);
}
}
diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java
index 0f31c52..5192b0f 100644
--- a/telecomm/java/android/telecomm/TelecommManager.java
+++ b/telecomm/java/android/telecomm/TelecommManager.java
@@ -72,10 +72,10 @@
* Optional extra for {@link android.content.Intent#ACTION_CALL} containing an integer that
* determines the desired video state for an outgoing call.
* Valid options:
- * {@link android.telecomm.VideoCallProfile.VideoState#AUDIO_ONLY},
- * {@link android.telecomm.VideoCallProfile.VideoState#BIDIRECTIONAL},
- * {@link android.telecomm.VideoCallProfile.VideoState#RX_ENABLED},
- * {@link android.telecomm.VideoCallProfile.VideoState#TX_ENABLED}.
+ * {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#RX_ENABLED},
+ * {@link VideoProfile.VideoState#TX_ENABLED}.
*/
public static final String EXTRA_START_CALL_WITH_VIDEO_STATE =
"android.intent.extra.START_CALL_WITH_VIDEO_STATE";
@@ -101,6 +101,17 @@
"android.intent.extra.INCOMING_CALL_EXTRAS";
/**
+ * Optional extra for {@link android.content.Intent#ACTION_CALL} and
+ * {@link android.content.Intent#ACTION_DIAL} {@code Intent} containing a {@link Bundle}
+ * which contains metadata about the call. This {@link Bundle} will be saved into
+ * {@code Call.Details}.
+ *
+ * @hide
+ */
+ public static final String EXTRA_OUTGOING_CALL_EXTRAS =
+ "android.intent.extra.OUTGOING_CALL_EXTRAS";
+
+ /**
* Optional extra for {@link android.telephony.TelephonyManager#ACTION_PHONE_STATE_CHANGED}
* containing the disconnect code.
*/
@@ -282,10 +293,10 @@
public List<PhoneAccountHandle> getEnabledPhoneAccounts() {
try {
if (isServiceConnected()) {
- return getTelecommService().getEnabledPhoneAccounts();
+ return getTelecommService().getOutgoingPhoneAccounts();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getEnabledPhoneAccounts", e);
+ Log.e(TAG, "Error calling ITelecommService#getOutgoingPhoneAccounts", e);
}
return null;
}
diff --git a/telecomm/java/android/telecomm/VideoCallImpl.java b/telecomm/java/android/telecomm/VideoCallImpl.java
index c32bcd2..c10865f 100644
--- a/telecomm/java/android/telecomm/VideoCallImpl.java
+++ b/telecomm/java/android/telecomm/VideoCallImpl.java
@@ -25,13 +25,15 @@
import android.view.Surface;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IVideoCallCallback;
-import com.android.internal.telecomm.IVideoCallProvider;
+import com.android.internal.telecomm.IVideoCallback;
+import com.android.internal.telecomm.IVideoProvider;
/**
* Implementation of a Video Call, which allows InCallUi to communicate commands to the underlying
- * {@link ConnectionService.VideoCallProvider}, and direct callbacks from the
- * {@link ConnectionService.VideoCallProvider} to the appropriate {@link VideoCall.Listener}.
+ * {@link Connection.VideoProvider}, and direct callbacks from the
+ * {@link Connection.VideoProvider} to the appropriate {@link VideoCall.Listener}.
+ *
+ * {@hide}
*/
public class VideoCallImpl extends VideoCall {
private static final int MSG_RECEIVE_SESSION_MODIFY_REQUEST = 1;
@@ -41,30 +43,30 @@
private static final int MSG_CHANGE_CALL_DATA_USAGE = 5;
private static final int MSG_CHANGE_CAMERA_CAPABILITIES = 6;
- private final IVideoCallProvider mVideoCallProvider;
+ private final IVideoProvider mVideoProvider;
private final VideoCallListenerBinder mBinder;
private VideoCall.Listener mVideoCallListener;
private IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() {
@Override
public void binderDied() {
- mVideoCallProvider.asBinder().unlinkToDeath(this, 0);
+ mVideoProvider.asBinder().unlinkToDeath(this, 0);
}
};
/**
- * IVideoCallCallback stub implementation.
+ * IVideoCallback stub implementation.
*/
- private final class VideoCallListenerBinder extends IVideoCallCallback.Stub {
+ private final class VideoCallListenerBinder extends IVideoCallback.Stub {
@Override
- public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile) {
+ public void receiveSessionModifyRequest(VideoProfile videoProfile) {
mHandler.obtainMessage(MSG_RECEIVE_SESSION_MODIFY_REQUEST,
- videoCallProfile).sendToTarget();
+ videoProfile).sendToTarget();
}
@Override
- public void receiveSessionModifyResponse(int status, VideoCallProfile requestProfile,
- VideoCallProfile responseProfile) {
+ public void receiveSessionModifyResponse(int status, VideoProfile requestProfile,
+ VideoProfile responseProfile) {
SomeArgs args = SomeArgs.obtain();
args.arg1 = status;
args.arg2 = requestProfile;
@@ -91,7 +93,7 @@
}
@Override
- public void changeCameraCapabilities(CallCameraCapabilities cameraCapabilities) {
+ public void changeCameraCapabilities(CameraCapabilities cameraCapabilities) {
mHandler.obtainMessage(MSG_CHANGE_CAMERA_CAPABILITIES,
cameraCapabilities).sendToTarget();
}
@@ -108,14 +110,14 @@
SomeArgs args;
switch (msg.what) {
case MSG_RECEIVE_SESSION_MODIFY_REQUEST:
- mVideoCallListener.onSessionModifyRequestReceived((VideoCallProfile) msg.obj);
+ mVideoCallListener.onSessionModifyRequestReceived((VideoProfile) msg.obj);
break;
case MSG_RECEIVE_SESSION_MODIFY_RESPONSE:
args = (SomeArgs) msg.obj;
try {
int status = (int) args.arg1;
- VideoCallProfile requestProfile = (VideoCallProfile) args.arg2;
- VideoCallProfile responseProfile = (VideoCallProfile) args.arg3;
+ VideoProfile requestProfile = (VideoProfile) args.arg2;
+ VideoProfile responseProfile = (VideoProfile) args.arg3;
mVideoCallListener.onSessionModifyResponseReceived(
status, requestProfile, responseProfile);
@@ -141,7 +143,7 @@
break;
case MSG_CHANGE_CAMERA_CAPABILITIES:
mVideoCallListener.onCameraCapabilitiesChanged(
- (CallCameraCapabilities) msg.obj);
+ (CameraCapabilities) msg.obj);
break;
default:
break;
@@ -150,12 +152,12 @@
};
/** {@hide} */
- VideoCallImpl(IVideoCallProvider videoCallProvider) throws RemoteException {
- mVideoCallProvider = videoCallProvider;
- mVideoCallProvider.asBinder().linkToDeath(mDeathRecipient, 0);
+ VideoCallImpl(IVideoProvider videoProvider) throws RemoteException {
+ mVideoProvider = videoProvider;
+ mVideoProvider.asBinder().linkToDeath(mDeathRecipient, 0);
mBinder = new VideoCallListenerBinder();
- mVideoCallProvider.setVideoCallListener(mBinder);
+ mVideoProvider.setVideoListener(mBinder);
}
/** {@inheritDoc} */
@@ -166,7 +168,7 @@
/** {@inheritDoc} */
public void setCamera(String cameraId) {
try {
- mVideoCallProvider.setCamera(cameraId);
+ mVideoProvider.setCamera(cameraId);
} catch (RemoteException e) {
}
}
@@ -174,7 +176,7 @@
/** {@inheritDoc} */
public void setPreviewSurface(Surface surface) {
try {
- mVideoCallProvider.setPreviewSurface(surface);
+ mVideoProvider.setPreviewSurface(surface);
} catch (RemoteException e) {
}
}
@@ -182,7 +184,7 @@
/** {@inheritDoc} */
public void setDisplaySurface(Surface surface) {
try {
- mVideoCallProvider.setDisplaySurface(surface);
+ mVideoProvider.setDisplaySurface(surface);
} catch (RemoteException e) {
}
}
@@ -190,7 +192,7 @@
/** {@inheritDoc} */
public void setDeviceOrientation(int rotation) {
try {
- mVideoCallProvider.setDeviceOrientation(rotation);
+ mVideoProvider.setDeviceOrientation(rotation);
} catch (RemoteException e) {
}
}
@@ -198,23 +200,23 @@
/** {@inheritDoc} */
public void setZoom(float value) {
try {
- mVideoCallProvider.setZoom(value);
+ mVideoProvider.setZoom(value);
} catch (RemoteException e) {
}
}
/** {@inheritDoc} */
- public void sendSessionModifyRequest(VideoCallProfile requestProfile) {
+ public void sendSessionModifyRequest(VideoProfile requestProfile) {
try {
- mVideoCallProvider.sendSessionModifyRequest(requestProfile);
+ mVideoProvider.sendSessionModifyRequest(requestProfile);
} catch (RemoteException e) {
}
}
/** {@inheritDoc} */
- public void sendSessionModifyResponse(VideoCallProfile responseProfile) {
+ public void sendSessionModifyResponse(VideoProfile responseProfile) {
try {
- mVideoCallProvider.sendSessionModifyResponse(responseProfile);
+ mVideoProvider.sendSessionModifyResponse(responseProfile);
} catch (RemoteException e) {
}
}
@@ -222,7 +224,7 @@
/** {@inheritDoc} */
public void requestCameraCapabilities() {
try {
- mVideoCallProvider.requestCameraCapabilities();
+ mVideoProvider.requestCameraCapabilities();
} catch (RemoteException e) {
}
}
@@ -230,7 +232,7 @@
/** {@inheritDoc} */
public void requestCallDataUsage() {
try {
- mVideoCallProvider.requestCallDataUsage();
+ mVideoProvider.requestCallDataUsage();
} catch (RemoteException e) {
}
}
@@ -238,7 +240,7 @@
/** {@inheritDoc} */
public void setPauseImage(String uri) {
try {
- mVideoCallProvider.setPauseImage(uri);
+ mVideoProvider.setPauseImage(uri);
} catch (RemoteException e) {
}
}
diff --git a/telecomm/java/android/telecomm/VideoCallProfile.aidl b/telecomm/java/android/telecomm/VideoCallProfile.aidl
deleted file mode 100644
index adbf94d..0000000
--- a/telecomm/java/android/telecomm/VideoCallProfile.aidl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-
-package android.telecomm;
-
-parcelable VideoCallProfile;
diff --git a/telecomm/java/android/telecomm/CallCameraCapabilities.aidl b/telecomm/java/android/telecomm/VideoProfile.aidl
similarity index 93%
rename from telecomm/java/android/telecomm/CallCameraCapabilities.aidl
rename to telecomm/java/android/telecomm/VideoProfile.aidl
index 25b6106..e756fa7 100644
--- a/telecomm/java/android/telecomm/CallCameraCapabilities.aidl
+++ b/telecomm/java/android/telecomm/VideoProfile.aidl
@@ -17,4 +17,7 @@
package android.telecomm;
-parcelable CallCameraCapabilities;
+/**
+ * {@hide}
+ */
+parcelable VideoProfile;
diff --git a/telecomm/java/android/telecomm/VideoCallProfile.java b/telecomm/java/android/telecomm/VideoProfile.java
similarity index 81%
rename from telecomm/java/android/telecomm/VideoCallProfile.java
rename to telecomm/java/android/telecomm/VideoProfile.java
index 24c6996..b147978 100644
--- a/telecomm/java/android/telecomm/VideoCallProfile.java
+++ b/telecomm/java/android/telecomm/VideoProfile.java
@@ -22,7 +22,7 @@
/**
* Represents attributes of video calls.
*/
-public class VideoCallProfile implements Parcelable {
+public class VideoProfile implements Parcelable {
/**
* "High" video quality.
*/
@@ -48,32 +48,32 @@
private final int mQuality;
/**
- * Creates an instance of the VideoCallProfile
+ * Creates an instance of the VideoProfile
*
* @param videoState The video state.
*/
- public VideoCallProfile(int videoState) {
+ public VideoProfile(int videoState) {
this(videoState, QUALITY_DEFAULT);
}
/**
- * Creates an instance of the VideoCallProfile
+ * Creates an instance of the VideoProfile
*
* @param videoState The video state.
* @param quality The video quality.
*/
- public VideoCallProfile(int videoState, int quality) {
+ public VideoProfile(int videoState, int quality) {
mVideoState = videoState;
mQuality = quality;
}
/**
* The video state of the call.
- * Valid values: {@link VideoCallProfile.VideoState#AUDIO_ONLY},
- * {@link VideoCallProfile.VideoState#BIDIRECTIONAL},
- * {@link VideoCallProfile.VideoState#TX_ENABLED},
- * {@link VideoCallProfile.VideoState#RX_ENABLED},
- * {@link VideoCallProfile.VideoState#PAUSED}.
+ * Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
+ * {@link VideoProfile.VideoState#BIDIRECTIONAL},
+ * {@link VideoProfile.VideoState#TX_ENABLED},
+ * {@link VideoProfile.VideoState#RX_ENABLED},
+ * {@link VideoProfile.VideoState#PAUSED}.
*/
public int getVideoState() {
return mVideoState;
@@ -81,18 +81,18 @@
/**
* The desired video quality for the call.
- * Valid values: {@link VideoCallProfile#QUALITY_HIGH}, {@link VideoCallProfile#QUALITY_MEDIUM},
- * {@link VideoCallProfile#QUALITY_LOW}, {@link VideoCallProfile#QUALITY_DEFAULT}.
+ * Valid values: {@link VideoProfile#QUALITY_HIGH}, {@link VideoProfile#QUALITY_MEDIUM},
+ * {@link VideoProfile#QUALITY_LOW}, {@link VideoProfile#QUALITY_DEFAULT}.
*/
public int getQuality() {
return mQuality;
}
/**
- * Responsible for creating VideoCallProfile objects from deserialized Parcels.
+ * Responsible for creating VideoProfile objects from deserialized Parcels.
**/
- public static final Parcelable.Creator<VideoCallProfile> CREATOR =
- new Parcelable.Creator<VideoCallProfile> () {
+ public static final Parcelable.Creator<VideoProfile> CREATOR =
+ new Parcelable.Creator<VideoProfile> () {
/**
* Creates a MediaProfile instances from a parcel.
*
@@ -100,17 +100,17 @@
* @return The MediaProfile.
*/
@Override
- public VideoCallProfile createFromParcel(Parcel source) {
+ public VideoProfile createFromParcel(Parcel source) {
int state = source.readInt();
int quality = source.readInt();
- ClassLoader classLoader = VideoCallProfile.class.getClassLoader();
- return new VideoCallProfile(state, quality);
+ ClassLoader classLoader = VideoProfile.class.getClassLoader();
+ return new VideoProfile(state, quality);
}
@Override
- public VideoCallProfile[] newArray(int size) {
- return new VideoCallProfile[size];
+ public VideoProfile[] newArray(int size) {
+ return new VideoProfile[size];
}
};
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
index 7abb4dd..c412424 100644
--- a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
@@ -17,7 +17,7 @@
package com.android.internal.telecomm;
import android.os.Bundle;
-import android.telecomm.CallAudioState;
+import android.telecomm.AudioState;
import android.telecomm.ConnectionRequest;
import android.telecomm.PhoneAccountHandle;
@@ -37,6 +37,7 @@
void createConnection(
in PhoneAccountHandle connectionManagerPhoneAccount,
+ String callId,
in ConnectionRequest request,
boolean isIncoming);
@@ -52,7 +53,7 @@
void unhold(String callId);
- void onAudioStateChanged(String activeCallId, in CallAudioState audioState);
+ void onAudioStateChanged(String activeCallId, in AudioState audioState);
void playDtmfTone(String callId, char digit);
@@ -62,8 +63,6 @@
void splitFromConference(String callId);
- void swapWithBackgroundCall(String callId);
-
void onPostDialContinue(String callId, boolean proceed);
void onPhoneAccountClicked(String callId);
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
index c6f9712..ef1769f 100644
--- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
@@ -20,9 +20,10 @@
import android.net.Uri;
import android.telecomm.ConnectionRequest;
import android.telecomm.ParcelableConnection;
+import android.telecomm.ParcelableConference;
import android.telecomm.StatusHints;
-import com.android.internal.telecomm.IVideoCallProvider;
+import com.android.internal.telecomm.IVideoProvider;
import com.android.internal.telecomm.RemoteServiceCallback;
/**
@@ -33,13 +34,10 @@
* {@hide}
*/
oneway interface IConnectionServiceAdapter {
- void handleCreateConnectionSuccessful(
- in ConnectionRequest request, in ParcelableConnection connection);
-
- void handleCreateConnectionFailed(
- in ConnectionRequest request, int errorCode, String errorMessage);
-
- void handleCreateConnectionCancelled(in ConnectionRequest request);
+ void handleCreateConnectionComplete(
+ String callId,
+ in ConnectionRequest request,
+ in ParcelableConnection connection);
void setActive(String callId);
@@ -57,7 +55,7 @@
void setIsConferenced(String callId, String conferenceCallId);
- void addConferenceCall(String callId);
+ void addConferenceCall(String callId, in ParcelableConference conference);
void removeCall(String callId);
@@ -65,7 +63,7 @@
void queryRemoteConnectionServices(RemoteServiceCallback callback);
- void setVideoCallProvider(String callId, IVideoCallProvider videoCallProvider);
+ void setVideoProvider(String callId, IVideoProvider videoProvider);
void setVideoState(String callId, int videoState);
diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
index 8bc950f..2ce5c6b 100644
--- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
@@ -16,7 +16,6 @@
package com.android.internal.telecomm;
-import android.telecomm.CallAudioState;
import android.telecomm.PhoneAccountHandle;
/**
@@ -55,8 +54,6 @@
void splitFromConference(String callId);
- void swapWithBackgroundCall(String callId);
-
void turnOnProximitySensor();
void turnOffProximitySensor(boolean screenOnImmediately);
diff --git a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl b/telecomm/java/com/android/internal/telecomm/IInCallService.aidl
index 8ec6196..5d4992f 100644
--- a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IInCallService.aidl
@@ -17,7 +17,7 @@
package com.android.internal.telecomm;
import android.app.PendingIntent;
-import android.telecomm.CallAudioState;
+import android.telecomm.AudioState;
import android.telecomm.ParcelableCall;
import com.android.internal.telecomm.IInCallAdapter;
@@ -40,7 +40,7 @@
void setPostDialWait(String callId, String remaining);
- void onAudioStateChanged(in CallAudioState audioState);
+ void onAudioStateChanged(in AudioState audioState);
void bringToForeground(boolean showDialpad);
diff --git a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl b/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
index 5036948..3c1dea6 100644
--- a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
+++ b/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
@@ -40,9 +40,9 @@
PhoneAccountHandle getDefaultOutgoingPhoneAccount();
/**
- * @see TelecommManager#getEnabledPhoneAccounts
+ * @see TelecommManager#getOutgoingPhoneAccounts
*/
- List<PhoneAccountHandle> getEnabledPhoneAccounts();
+ List<PhoneAccountHandle> getOutgoingPhoneAccounts();
/**
* @see TelecommManager#getPhoneAccount
diff --git a/telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl b/telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl
deleted file mode 100644
index 1a8f68e..0000000
--- a/telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.telecomm;
-
-import android.telecomm.CallCameraCapabilities;
-import android.telecomm.VideoCallProfile;
-
-/**
- * Internal definition of a callback interface, used for an InCallUi to respond to video telephony
- * changes.
- *
- * @see android.telecomm.InCallService.VideoCall.Listener
- *
- * {@hide}
- */
-oneway interface IVideoCallCallback {
- void receiveSessionModifyRequest(in VideoCallProfile videoCallProfile);
-
- void receiveSessionModifyResponse(int status, in VideoCallProfile requestedProfile,
- in VideoCallProfile responseProfile);
-
- void handleCallSessionEvent(int event);
-
- void changePeerDimensions(int width, int height);
-
- void changeCallDataUsage(int dataUsage);
-
- void changeCameraCapabilities(in CallCameraCapabilities callCameraCapabilities);
-}
diff --git a/telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl b/telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl
new file mode 100644
index 0000000..186f083
--- /dev/null
+++ b/telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telecomm;
+
+import android.telecomm.CameraCapabilities;
+import android.telecomm.VideoProfile;
+
+ /**
+ * Internal definition of a callback interface, used for an InCallUi to respond to video
+ * telephony changes.
+ *
+ * @see android.telecomm.InCallService.VideoCall.Listener
+ *
+ * {@hide}
+ */
+oneway interface IVideoCallback {
+ void receiveSessionModifyRequest(in VideoProfile videoProfile);
+
+ void receiveSessionModifyResponse(
+ int status,
+ in VideoProfile requestedProfile,
+ in VideoProfile responseProfile);
+
+ void handleCallSessionEvent(int event);
+
+ void changePeerDimensions(int width, int height);
+
+ void changeCallDataUsage(int dataUsage);
+
+ void changeCameraCapabilities(in CameraCapabilities cameraCapabilities);
+}
diff --git a/telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl b/telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl
similarity index 76%
rename from telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl
rename to telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl
index c1ba749..9d3ad7f 100644
--- a/telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl
@@ -17,15 +17,15 @@
package com.android.internal.telecomm;
import android.view.Surface;
-import android.telecomm.VideoCallProfile;
+import android.telecomm.VideoProfile;
/**
* Internal remote interface for a video call provider.
- * @see android.telecomm.VideoCallProvider
+ * @see android.telecomm.VideoProvider
* @hide
*/
-oneway interface IVideoCallProvider {
- void setVideoCallListener(IBinder videoCallListenerBinder);
+oneway interface IVideoProvider {
+ void setVideoListener(IBinder videoListenerBinder);
void setCamera(String cameraId);
@@ -37,9 +37,9 @@
void setZoom(float value);
- void sendSessionModifyRequest(in VideoCallProfile reqProfile);
+ void sendSessionModifyRequest(in VideoProfile reqProfile);
- void sendSessionModifyResponse(in VideoCallProfile responseProfile);
+ void sendSessionModifyResponse(in VideoProfile responseProfile);
void requestCameraCapabilities();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index c50110a..d4f8362 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2459,7 +2459,7 @@
* @param filePath
* @return The APDU response.
*/
- byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
+ public byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
String filePath) {
try {
return getITelephony().iccExchangeSimIO(fileID, command, p1, p2,
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java
index adcb435..dcd0b79 100644
--- a/telephony/java/com/android/ims/ImsCallProfile.java
+++ b/telephony/java/com/android/ims/ImsCallProfile.java
@@ -19,7 +19,7 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.telecomm.VideoCallProfile;
+import android.telecomm.VideoProfile;
/**
* Parcelable object to handle IMS call profile.
@@ -290,7 +290,7 @@
/**
* Converts from the call types defined in {@link com.android.ims.ImsCallProfile} to the
- * video state values defined in {@link android.telecomm.VideoCallProfile}.
+ * video state values defined in {@link VideoProfile}.
*
* @param callType The call type.
* @return The video state.
@@ -298,32 +298,32 @@
public static int getVideoStateFromCallType(int callType) {
switch (callType) {
case CALL_TYPE_VT_NODIR:
- return VideoCallProfile.VideoState.PAUSED |
- VideoCallProfile.VideoState.BIDIRECTIONAL;
+ return VideoProfile.VideoState.PAUSED |
+ VideoProfile.VideoState.BIDIRECTIONAL;
case CALL_TYPE_VT_TX:
- return VideoCallProfile.VideoState.TX_ENABLED;
+ return VideoProfile.VideoState.TX_ENABLED;
case CALL_TYPE_VT_RX:
- return VideoCallProfile.VideoState.RX_ENABLED;
+ return VideoProfile.VideoState.RX_ENABLED;
case CALL_TYPE_VT:
- return VideoCallProfile.VideoState.BIDIRECTIONAL;
+ return VideoProfile.VideoState.BIDIRECTIONAL;
case CALL_TYPE_VOICE:
- return VideoCallProfile.VideoState.AUDIO_ONLY;
+ return VideoProfile.VideoState.AUDIO_ONLY;
default:
- return VideoCallProfile.VideoState.AUDIO_ONLY;
+ return VideoProfile.VideoState.AUDIO_ONLY;
}
}
/**
- * Converts from the video state values defined in {@link android.telecomm.VideoCallProfile}
+ * Converts from the video state values defined in {@link VideoProfile}
* to the call types defined in {@link ImsCallProfile}.
*
* @param videoState The video state.
* @return The call type.
*/
public static int getCallTypeFromVideoState(int videoState) {
- boolean videoTx = isVideoStateSet(videoState, VideoCallProfile.VideoState.TX_ENABLED);
- boolean videoRx = isVideoStateSet(videoState, VideoCallProfile.VideoState.RX_ENABLED);
- boolean isPaused = isVideoStateSet(videoState, VideoCallProfile.VideoState.PAUSED);
+ boolean videoTx = isVideoStateSet(videoState, VideoProfile.VideoState.TX_ENABLED);
+ boolean videoRx = isVideoStateSet(videoState, VideoProfile.VideoState.RX_ENABLED);
+ boolean isPaused = isVideoStateSet(videoState, VideoProfile.VideoState.PAUSED);
if (isPaused) {
return ImsCallProfile.CALL_TYPE_VT_NODIR;
} else if (videoTx && !videoRx) {
diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
index 6b8ec52..67bfe41 100644
--- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
+++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
@@ -16,8 +16,8 @@
package com.android.ims.internal;
-import android.telecomm.CallCameraCapabilities;
-import android.telecomm.VideoCallProfile;
+import android.telecomm.CameraCapabilities;
+import android.telecomm.VideoProfile;
/**
* Internal remote interface for IMS's video call provider.
@@ -32,10 +32,10 @@
* {@hide}
*/
oneway interface IImsVideoCallCallback {
- void receiveSessionModifyRequest(in VideoCallProfile videoCallProfile);
+ void receiveSessionModifyRequest(in VideoProfile videoProfile);
- void receiveSessionModifyResponse(int status, in VideoCallProfile requestedProfile,
- in VideoCallProfile responseProfile);
+ void receiveSessionModifyResponse(int status, in VideoProfile requestedProfile,
+ in VideoProfile responseProfile);
void handleCallSessionEvent(int event);
@@ -43,5 +43,5 @@
void changeCallDataUsage(int dataUsage);
- void changeCameraCapabilities(in CallCameraCapabilities callCameraCapabilities);
+ void changeCameraCapabilities(in CameraCapabilities cameraCapabilities);
}
diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
index f8389ec..4db0d14 100644
--- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
+++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
@@ -17,7 +17,7 @@
package com.android.ims.internal;
import android.view.Surface;
-import android.telecomm.VideoCallProfile;
+import android.telecomm.VideoProfile;
import com.android.ims.internal.IImsVideoCallCallback;
@@ -52,9 +52,9 @@
void setZoom(float value);
- void sendSessionModifyRequest(in VideoCallProfile reqProfile);
+ void sendSessionModifyRequest(in VideoProfile reqProfile);
- void sendSessionModifyResponse(in VideoCallProfile responseProfile);
+ void sendSessionModifyResponse(in VideoProfile responseProfile);
void requestCameraCapabilities();
diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java
index cf87bec..b4b1ea5 100644
--- a/telephony/java/com/android/internal/telephony/PhoneConstants.java
+++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java
@@ -187,4 +187,7 @@
REASON_RADIO_UNAVAILABLE,
REASON_SIM_REFRESH_RESET
};
+
+ // Initial MTU value.
+ public static final int UNSET_MTU = 0;
}
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 15298599..a8a9057 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -287,6 +287,7 @@
int RIL_REQUEST_ALLOW_DATA = 123;
int RIL_REQUEST_GET_HARDWARE_CONFIG = 124;
int RIL_REQUEST_SIM_AUTHENTICATION = 125;
+ int RIL_REQUEST_SET_DATA_PROFILE = 128;
int RIL_UNSOL_RESPONSE_BASE = 1000;
int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
diff --git a/tests/ActivityTests/AndroidManifest.xml b/tests/ActivityTests/AndroidManifest.xml
index 15d075c..c0898d30 100644
--- a/tests/ActivityTests/AndroidManifest.xml
+++ b/tests/ActivityTests/AndroidManifest.xml
@@ -23,6 +23,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application android:label="ActivityTest">
<activity android:name="ActivityTestMain">
<intent-filter>
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
index 0e063d6..9002125 100644
--- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
+++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
@@ -34,6 +34,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.graphics.Bitmap;
+import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -130,6 +131,12 @@
mSecondUser = ui.id;
}
}
+
+ /*
+ AlertDialog ad = new AlertDialog.Builder(this).setTitle("title").setMessage("message").create();
+ ad.getWindow().getAttributes().type = WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;
+ ad.show();
+ */
}
@Override
diff --git a/tests/FeatureSplit/feature1/Android.mk b/tests/FeatureSplit/feature1/Android.mk
index 3059824..adfb575 100644
--- a/tests/FeatureSplit/feature1/Android.mk
+++ b/tests/FeatureSplit/feature1/Android.mk
@@ -26,7 +26,6 @@
localRStamp := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),,COMMON)/src/R.stamp
$(localRStamp): $(featureOfApk)
-$(info $(localRStamp))
LOCAL_AAPT_FLAGS := --feature-of $(featureOfApk)
include $(BUILD_PACKAGE)
diff --git a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java
index c0f3a7f..526ea5d 100644
--- a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java
+++ b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * 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.
diff --git a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/BrowserListFragment.java b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/BrowserListFragment.java
index 3fc468d..2fc77dc 100644
--- a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/BrowserListFragment.java
+++ b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/BrowserListFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * 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.
diff --git a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/MainActivity.java b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/MainActivity.java
index ed91aad..4c28234 100644
--- a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/MainActivity.java
+++ b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/MainActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * 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.
diff --git a/tests/OneMedia/Android.mk b/tests/OneMedia/Android.mk
index 4feac68..4d39728 100644
--- a/tests/OneMedia/Android.mk
+++ b/tests/OneMedia/Android.mk
@@ -9,9 +9,6 @@
LOCAL_PACKAGE_NAME := OneMedia
LOCAL_CERTIFICATE := platform
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-media-protocols
-
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
diff --git a/tests/OneMedia/AndroidManifest.xml b/tests/OneMedia/AndroidManifest.xml
index 9d78ca5..beafeb4 100644
--- a/tests/OneMedia/AndroidManifest.xml
+++ b/tests/OneMedia/AndroidManifest.xml
@@ -23,17 +23,8 @@
</activity>
<service
android:name="com.android.onemedia.OnePlayerService"
- android:exported="false"
- android:process="com.android.onemedia.service" />
- <service
- android:name=".provider.OneMediaRouteProvider"
- android:permission="android.permission.BIND_MEDIA_ROUTE_SERVICE"
android:exported="true"
- android:process="com.android.onemedia.provider">
- <intent-filter>
- <action android:name="android.media.routing.MediaRouteService" />
- </intent-filter>
- </service>
+ android:process="com.android.onemedia.service" />
</application>
</manifest>
diff --git a/tests/OneMedia/res/drawable/ic_fast_forward.xml b/tests/OneMedia/res/drawable/ic_fast_forward.xml
new file mode 100644
index 0000000..8daf07d
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_fast_forward.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.0,18.0l8.5,-6.0L4.0,6.0L4.0,18.0zM13.0,6.0l0.0,12.0l8.5,-6.0L13.0,6.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_fast_rewind.xml b/tests/OneMedia/res/drawable/ic_fast_rewind.xml
new file mode 100644
index 0000000..4ed1f54
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_fast_rewind.xml
@@ -0,0 +1,24 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M11.0,18.0L11.0,6.0l-8.5,6.0L11.0,18.0zM11.5,12.0l8.5,6.0L20.0,6.0L11.5,12.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_pause.xml b/tests/OneMedia/res/drawable/ic_pause.xml
new file mode 100644
index 0000000..15d0756
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_pause.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6.0,19.0l4.0,0.0L10.0,5.0L6.0,5.0L6.0,19.0zM14.0,5.0l0.0,14.0l4.0,0.0L18.0,5.0L14.0,5.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_play_arrow.xml b/tests/OneMedia/res/drawable/ic_play_arrow.xml
new file mode 100644
index 0000000..49d766d
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_play_arrow.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M8.0,5.0l0.0,14.0 11.0,-7.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_skip_next.xml b/tests/OneMedia/res/drawable/ic_skip_next.xml
new file mode 100644
index 0000000..8a6ceca
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_skip_next.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6.0,18.0l8.5,-6.0L6.0,6.0L6.0,18.0zM16.0,6.0l0.0,12.0l2.0,0.0L18.0,6.0L16.0,6.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_skip_previous.xml b/tests/OneMedia/res/drawable/ic_skip_previous.xml
new file mode 100644
index 0000000..c5d07db
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_skip_previous.xml
@@ -0,0 +1,28 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6.0,6.0l2.0,0.0l0.0,12.0l-2.0,0.0z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M9.5,12.0l8.5,6.0 0.0,-12.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/drawable/ic_stop.xml b/tests/OneMedia/res/drawable/ic_stop.xml
new file mode 100644
index 0000000..6043fdb6
--- /dev/null
+++ b/tests/OneMedia/res/drawable/ic_stop.xml
@@ -0,0 +1,25 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24" >
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6.0,6.0l12.0,0.0l0.0,12.0l-12.0,0.0z"/>
+</vector>
diff --git a/tests/OneMedia/res/layout/activity_one_player.xml b/tests/OneMedia/res/layout/activity_one_player.xml
index 516562f..ce2d641 100644
--- a/tests/OneMedia/res/layout/activity_one_player.xml
+++ b/tests/OneMedia/res/layout/activity_one_player.xml
@@ -33,6 +33,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/has_video" />
+ <ImageView
+ android:id="@+id/art"
+ android:layout_width="match_parent"
+ android:layout_height="96dp"
+ android:scaleType="centerCrop"
+ android:visibility="gone"
+ />
+ <Button
+ android:id="@+id/art_picker"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/art_picker"
+ />
<LinearLayout
android:id="@+id/controls"
android:layout_width="match_parent"
diff --git a/tests/OneMedia/res/values/strings.xml b/tests/OneMedia/res/values/strings.xml
index 3735c8d..86657fd 100644
--- a/tests/OneMedia/res/values/strings.xml
+++ b/tests/OneMedia/res/values/strings.xml
@@ -12,5 +12,5 @@
<string name="media_next_hint">Next content</string>
<string name="has_video">Is video</string>
<string name="has_duration">Has duration</string>
-
+ <string name="art_picker">Choose artwork</string>
</resources>
diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl
index d4df4c5..f53eac0 100644
--- a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl
+++ b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl
@@ -15,6 +15,7 @@
package com.android.onemedia;
+import android.graphics.Bitmap;
import android.media.session.MediaSession;
import android.os.Bundle;
@@ -26,4 +27,5 @@
void registerCallback(in IPlayerCallback cb);
void unregisterCallback(in IPlayerCallback cb);
void sendRequest(String action, in Bundle params, in IRequestCallback cb);
+ void setIcon(in Bitmap icon);
}
diff --git a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java
new file mode 100644
index 0000000..a5bcda5
--- /dev/null
+++ b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java
@@ -0,0 +1,234 @@
+package com.android.onemedia;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.media.MediaMetadata;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.onemedia.playback.RequestUtils;
+
+/**
+ * Keeps track of a notification and updates it automatically for a given
+ * MediaSession.
+ */
+public class NotificationHelper extends BroadcastReceiver {
+ private static final String TAG = "NotificationHelper";
+
+ private static final int NOTIFICATION_ID = 433; // John Cage, 1952
+
+ private final Service mService;
+ private final MediaSession mSession;
+ private final MediaController mController;
+ private final MediaController.TransportControls mTransportControls;
+ private final SparseArray<PendingIntent> mIntents = new SparseArray<PendingIntent>();
+
+ private PlaybackState mPlaybackState;
+ private MediaMetadata mMetadata;
+
+ private boolean mStarted = false;
+
+ public NotificationHelper(Service service, MediaSession session) {
+ mService = service;
+ mSession = session;
+ mController = session.getController();
+ mTransportControls = mController.getTransportControls();
+ String pkg = mService.getPackageName();
+
+ mIntents.put(R.drawable.ic_pause, PendingIntent.getBroadcast(mService, 100, new Intent(
+ com.android.onemedia.playback.RequestUtils.ACTION_PAUSE).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ mIntents.put(R.drawable.ic_play_arrow, PendingIntent.getBroadcast(mService, 100,
+ new Intent(com.android.onemedia.playback.RequestUtils.ACTION_PLAY).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ mIntents.put(R.drawable.ic_skip_previous, PendingIntent.getBroadcast(mService, 100,
+ new Intent(com.android.onemedia.playback.RequestUtils.ACTION_PREV).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ mIntents.put(R.drawable.ic_skip_next, PendingIntent.getBroadcast(mService, 100,
+ new Intent(com.android.onemedia.playback.RequestUtils.ACTION_NEXT).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ mIntents.put(R.drawable.ic_fast_rewind, PendingIntent.getBroadcast(mService, 100,
+ new Intent(com.android.onemedia.playback.RequestUtils.ACTION_REW).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ mIntents.put(R.drawable.ic_fast_forward, PendingIntent.getBroadcast(mService, 100,
+ new Intent(com.android.onemedia.playback.RequestUtils.ACTION_FFWD).setPackage(pkg),
+ PendingIntent.FLAG_CANCEL_CURRENT));
+ }
+
+ /**
+ * Posts the notification and starts tracking the session to keep it
+ * updated. The notification will automatically be removed if the session is
+ * destroyed before {@link #onStop} is called.
+ */
+ public void onStart() {
+ mController.addCallback(mCb);
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(RequestUtils.ACTION_FFWD);
+ filter.addAction(RequestUtils.ACTION_NEXT);
+ filter.addAction(RequestUtils.ACTION_PAUSE);
+ filter.addAction(RequestUtils.ACTION_PLAY);
+ filter.addAction(RequestUtils.ACTION_PREV);
+ filter.addAction(RequestUtils.ACTION_REW);
+ mService.registerReceiver(this, filter);
+
+ mMetadata = mController.getMetadata();
+ mPlaybackState = mController.getPlaybackState();
+
+ mStarted = true;
+ // The notification must be updated after setting started to true
+ updateNotification();
+ }
+
+ /**
+ * Removes the notification and stops tracking the session. If the session
+ * was destroyed this has no effect.
+ */
+ public void onStop() {
+ mStarted = false;
+ mController.removeCallback(mCb);
+ mService.unregisterReceiver(this);
+ updateNotification();
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final String action = intent.getAction();
+ Log.d(TAG, "Received intent with action " + action);
+ if (RequestUtils.ACTION_PAUSE.equals(action)) {
+ mTransportControls.pause();
+ } else if (RequestUtils.ACTION_PLAY.equals(action)) {
+ mTransportControls.play();
+ } else if (RequestUtils.ACTION_NEXT.equals(action)) {
+ mTransportControls.skipToNext();
+ } else if (RequestUtils.ACTION_PREV.equals(action)) {
+ mTransportControls.skipToPrevious();
+ } else if (RequestUtils.ACTION_REW.equals(action)) {
+ mTransportControls.rewind();
+ } else if (RequestUtils.ACTION_FFWD.equals(action)) {
+ mTransportControls.fastForward();
+ }
+
+ }
+
+ private final MediaController.Callback mCb = new MediaController.Callback() {
+ @Override
+ public void onPlaybackStateChanged(PlaybackState state) {
+ mPlaybackState = state;
+ Log.d(TAG, "Received new playback state" + state);
+ updateNotification();
+ }
+
+ @Override
+ public void onMetadataChanged(MediaMetadata metadata) {
+ mMetadata = metadata;
+ Log.d(TAG, "Received new metadata " + metadata);
+ updateNotification();
+ }
+ };
+
+ NotificationManager mNoMan = null;
+
+ private void updateNotification() {
+ if (mNoMan == null) {
+ mNoMan = (NotificationManager) mService.getSystemService(Context.NOTIFICATION_SERVICE);
+ }
+ if (mPlaybackState == null) {
+ mNoMan.cancel(NOTIFICATION_ID);
+ return;
+ }
+ if (!mStarted) {
+ mNoMan.cancel(NOTIFICATION_ID);
+ return;
+ }
+
+ String status;
+ final int state = mPlaybackState.getState();
+ switch (state) {
+ case PlaybackState.STATE_PLAYING:
+ status = "PLAYING: ";
+ break;
+ case PlaybackState.STATE_PAUSED:
+ status = "PAUSED: ";
+ break;
+ case PlaybackState.STATE_STOPPED:
+ status = "STOPPED: ";
+ break;
+ case PlaybackState.STATE_ERROR:
+ status = "ERROR: ";
+ break;
+ case PlaybackState.STATE_BUFFERING:
+ status = "BUFFERING: ";
+ break;
+ case PlaybackState.STATE_NONE:
+ default:
+ status = "";
+ break;
+ }
+ CharSequence title, text;
+ Bitmap art;
+ if (mMetadata == null) {
+ title = status;
+ text = "Empty metadata!";
+ art = null;
+ } else {
+ MediaMetadata.Description description = mMetadata.getDescription();
+ title = description.getTitle();
+ text = description.getSubtitle();
+ art = description.getIcon();
+ }
+
+ String playPauseLabel = "";
+ int playPauseIcon;
+ if (state == PlaybackState.STATE_PLAYING) {
+ playPauseLabel = "Pause";
+ playPauseIcon = R.drawable.ic_pause;
+ } else {
+ playPauseLabel = "Play";
+ playPauseIcon = R.drawable.ic_play_arrow;
+ }
+
+ final long pos = mPlaybackState.getPosition();
+ final long end = mMetadata == null ? 0 : mMetadata
+ .getLong(MediaMetadata.METADATA_KEY_DURATION);
+ Notification notification = new Notification.Builder(mService)
+ .setSmallIcon(android.R.drawable.stat_notify_chat)
+ .setContentTitle(title)
+ .setContentText(text)
+ .setShowWhen(false)
+ .setContentInfo(DateUtils.formatElapsedTime(pos))
+ .setProgress((int) end, (int) pos, false)
+ .setLargeIcon(art)
+ .addAction(R.drawable.ic_skip_previous, "Previous",
+ mIntents.get(R.drawable.ic_skip_previous))
+ .addAction(R.drawable.ic_fast_rewind, "Rewind",
+ mIntents.get(R.drawable.ic_fast_rewind))
+ .addAction(playPauseIcon, playPauseLabel,
+ mIntents.get(playPauseIcon))
+ .addAction(R.drawable.ic_fast_forward, "Fast Forward",
+ mIntents.get(R.drawable.ic_fast_forward))
+ .addAction(R.drawable.ic_skip_next, "Next",
+ mIntents.get(R.drawable.ic_skip_next))
+ .setStyle(new Notification.MediaStyle()
+ .setShowActionsInCompactView(2)
+ .setMediaSession(mSession.getSessionToken()))
+ .setColor(0xFFDB4437)
+ .build();
+
+ mService.startForeground(NOTIFICATION_ID, notification);
+ }
+
+}
diff --git a/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java b/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java
index 894377b..2ff3e20 100644
--- a/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java
+++ b/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java
@@ -17,20 +17,35 @@
import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.media.MediaMetadata;
import android.media.session.PlaybackState;
+import android.net.Uri;
import android.os.Bundle;
+import android.provider.MediaStore;
+import android.text.format.DateUtils;
import android.util.Log;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.TextView;
+import java.io.IOException;
+
public class OnePlayerActivity extends Activity {
private static final String TAG = "OnePlayerActivity";
+ private static final int READ_REQUEST_CODE = 42;
+
protected PlayerController mPlayer;
private Button mStartButton;
@@ -41,8 +56,10 @@
private EditText mContentText;
private EditText mNextContentText;
private CheckBox mHasVideo;
+ private ImageView mArtView;
- private int mPlaybackState;
+ private PlaybackState mPlaybackState;
+ private Bitmap mAlbumArtBitmap;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +75,10 @@
mContentText = (EditText) findViewById(R.id.content);
mNextContentText = (EditText) findViewById(R.id.next_content);
mHasVideo = (CheckBox) findViewById(R.id.has_video);
+ mArtView = (ImageView) findViewById(R.id.art);
+
+ final Button artPicker = (Button) findViewById(R.id.art_picker);
+ artPicker.setOnClickListener(mButtonListener);
mStartButton.setOnClickListener(mButtonListener);
mPlayButton.setOnClickListener(mButtonListener);
@@ -86,6 +107,31 @@
super.onPause();
}
+ @Override
+ public void onActivityResult(int requestCode, int resultCode,
+ Intent resultData) {
+ if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+ Uri uri = null;
+ if (resultData != null) {
+ uri = resultData.getData();
+ Log.i(TAG, "Uri: " + uri.toString());
+ mAlbumArtBitmap = null;
+ try {
+ mAlbumArtBitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri);
+ } catch (IOException e) {
+ Log.v(TAG, "Couldn't load album art", e);
+ }
+ mArtView.setImageBitmap(mAlbumArtBitmap);
+ if (mAlbumArtBitmap != null) {
+ mArtView.setVisibility(View.VISIBLE);
+ } else {
+ mArtView.setVisibility(View.GONE);
+ }
+ mPlayer.setArt(mAlbumArtBitmap);
+ }
+ }
+ }
+
private void setControlsEnabled(boolean enabled) {
mStartButton.setEnabled(enabled);
mPlayButton.setEnabled(enabled);
@@ -94,36 +140,46 @@
private View.OnClickListener mButtonListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
+ final int state = mPlaybackState.getState();
switch (v.getId()) {
case R.id.play_button:
- Log.d(TAG, "Play button pressed, in state " + mPlaybackState);
- if (mPlaybackState == PlaybackState.STATE_PAUSED
- || mPlaybackState == PlaybackState.STATE_STOPPED) {
+ Log.d(TAG, "Play button pressed, in state " + state);
+ if (state == PlaybackState.STATE_PAUSED
+ || state == PlaybackState.STATE_STOPPED) {
mPlayer.play();
- } else if (mPlaybackState == PlaybackState.STATE_PLAYING) {
+ } else if (state == PlaybackState.STATE_PLAYING) {
mPlayer.pause();
}
break;
case R.id.start_button:
- Log.d(TAG, "Start button pressed, in state " + mPlaybackState);
+ Log.d(TAG, "Start button pressed, in state " + state);
mPlayer.setContent(mContentText.getText().toString());
break;
case R.id.route_button:
mPlayer.showRoutePicker();
break;
+ case R.id.art_picker:
+ Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+ intent.addCategory(Intent.CATEGORY_OPENABLE);
+ intent.setType("image/*");
+
+ startActivityForResult(intent, READ_REQUEST_CODE);
+ break;
}
}
};
private PlayerController.Listener mListener = new PlayerController.Listener() {
+ public MediaMetadata mMetadata;
+
@Override
public void onPlaybackStateChange(PlaybackState state) {
- mPlaybackState = state.getState();
+ mPlaybackState = state;
boolean enablePlay = false;
boolean enableControls = true;
StringBuilder statusBuilder = new StringBuilder();
- switch (mPlaybackState) {
+ switch (mPlaybackState.getState()) {
case PlaybackState.STATE_PLAYING:
statusBuilder.append("playing");
mPlayButton.setText("Pause");
@@ -172,7 +228,7 @@
@Override
public void onMetadataChange(MediaMetadata metadata) {
- Log.d(TAG, "Metadata update! Title: " + metadata);
+ mMetadata = metadata;
}
};
}
diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerController.java b/tests/OneMedia/src/com/android/onemedia/PlayerController.java
index c0799fc..c8d72ca 100644
--- a/tests/OneMedia/src/com/android/onemedia/PlayerController.java
+++ b/tests/OneMedia/src/com/android/onemedia/PlayerController.java
@@ -30,6 +30,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.graphics.Bitmap;
import android.util.Log;
import com.android.onemedia.playback.RequestUtils;
@@ -52,6 +53,7 @@
private Handler mHandler = new Handler();
private boolean mResumed;
+ private Bitmap mArt;
public PlayerController(Activity context, Intent serviceIntent) {
mContext = context;
@@ -89,6 +91,16 @@
unbindFromService();
}
+ public void setArt(Bitmap art) {
+ mArt = art;
+ if (mBinder != null) {
+ try {
+ mBinder.setIcon(art);
+ } catch (RemoteException e) {
+ }
+ }
+ }
+
public void play() {
if (mTransportControls != null) {
mTransportControls.play();
@@ -125,6 +137,16 @@
// TODO
}
+ public MediaSession.Token getSessionToken() {
+ if (mBinder != null) {
+ try {
+ return mBinder.getSessionToken();
+ } catch (RemoteException e) {
+ }
+ }
+ return null;
+ }
+
private void unbindFromService() {
mContext.unbindService(mServiceConnection);
}
@@ -165,6 +187,9 @@
mContext.setMediaController(mController);
mController.addCallback(mControllerCb, mHandler);
mTransportControls = mController.getTransportControls();
+ if (mArt != null) {
+ setArt(mArt);
+ }
Log.d(TAG, "Ready to use PlayerService");
if (mListener != null) {
@@ -194,6 +219,9 @@
return;
}
Log.d(TAG, "Received metadata change, " + metadata.getDescription());
+ if (mListener != null) {
+ mListener.onMetadataChange(metadata);
+ }
}
}
diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerService.java b/tests/OneMedia/src/com/android/onemedia/PlayerService.java
index 58ee4a1..9967c99 100644
--- a/tests/OneMedia/src/com/android/onemedia/PlayerService.java
+++ b/tests/OneMedia/src/com/android/onemedia/PlayerService.java
@@ -17,6 +17,7 @@
import android.app.Service;
import android.content.Intent;
+import android.graphics.Bitmap;
import android.media.session.MediaSession;
import android.media.session.PlaybackState;
import android.os.Bundle;
@@ -34,6 +35,7 @@
private PlayerBinder mBinder;
private PlayerSession mSession;
+ private NotificationHelper mNotifyHelper;
private Intent mIntent;
private boolean mStarted = false;
@@ -47,6 +49,7 @@
mSession = onCreatePlayerController();
mSession.createSession();
mSession.setListener(mPlayerListener);
+ mNotifyHelper = new NotificationHelper(this, mSession.mSession);
}
}
@@ -75,6 +78,7 @@
if (!mStarted) {
Log.d(TAG, "Starting self");
startService(onCreateServiceIntent());
+ mNotifyHelper.onStart();
mStarted = true;
}
}
@@ -82,6 +86,7 @@
public void onPlaybackEnded() {
if (mStarted) {
Log.d(TAG, "Stopping self");
+ mNotifyHelper.onStop();
stopSelf();
mStarted = false;
}
@@ -150,8 +155,17 @@
@Override
public MediaSession.Token getSessionToken() throws RemoteException {
+ if (mSession == null) {
+ Log.e(TAG, "Error in PlayerService: mSession=null in getSessionToken()");
+ return null;
+ }
return mSession.getSessionToken();
}
+
+ @Override
+ public void setIcon(Bitmap icon) {
+ mSession.setIcon(icon);
+ }
}
}
diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java
index 890d68d..8b7c883 100644
--- a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java
+++ b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java
@@ -17,24 +17,18 @@
import android.content.Context;
import android.content.Intent;
-import android.media.routing.MediaRouteSelector;
-import android.media.routing.MediaRouter;
-import android.media.routing.MediaRouter.ConnectionRequest;
-import android.media.routing.MediaRouter.DestinationInfo;
-import android.media.routing.MediaRouter.RouteInfo;
+import android.graphics.Bitmap;
+import android.media.MediaMetadata;
import android.media.session.MediaSession;
import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState;
import android.os.Bundle;
-import android.support.media.protocols.MediaPlayerProtocol;
-import android.support.media.protocols.MediaPlayerProtocol.MediaStatus;
import android.os.RemoteException;
import android.os.SystemClock;
import android.util.Log;
import android.view.KeyEvent;
import com.android.onemedia.playback.LocalRenderer;
-import com.android.onemedia.playback.OneMRPRenderer;
import com.android.onemedia.playback.Renderer;
import com.android.onemedia.playback.RequestUtils;
@@ -45,11 +39,11 @@
private static final String TAG = "PlayerSession";
protected MediaSession mSession;
- protected MediaRouter mRouter;
protected Context mContext;
protected Renderer mRenderer;
protected MediaSession.Callback mCallback;
protected Renderer.Listener mRenderListener;
+ protected MediaMetadata.Builder mMetadataBuilder;
protected PlaybackState mPlaybackState;
protected Listener mListener;
@@ -66,6 +60,8 @@
mPlaybackState = psBob.build();
mRenderer.registerListener(mRenderListener);
+
+ initMetadata();
}
public void createSession() {
@@ -75,23 +71,13 @@
.getSystemService(Context.MEDIA_SESSION_SERVICE);
Log.d(TAG, "Creating session for package " + mContext.getBasePackageName());
- mRouter = new MediaRouter(mContext);
- mRouter.addSelector(new MediaRouteSelector.Builder()
- .addRequiredProtocol(MediaPlayerProtocol.class)
- .build());
- mRouter.addSelector(new MediaRouteSelector.Builder()
- .setRequiredFeatures(MediaRouter.ROUTE_FEATURE_LIVE_AUDIO)
- .setOptionalFeatures(MediaRouter.ROUTE_FEATURE_LIVE_VIDEO)
- .build());
- mRouter.setRoutingCallback(new RoutingCallback(), null);
-
mSession = new MediaSession(mContext, "OneMedia");
mSession.setCallback(mCallback);
mSession.setPlaybackState(mPlaybackState);
mSession.setFlags(MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS
| MediaSession.FLAG_HANDLES_MEDIA_BUTTONS);
- mSession.setMediaRouter(mRouter);
mSession.setActive(true);
+ updateMetadata();
}
public void onDestroy() {
@@ -107,10 +93,6 @@
mSession.release();
mSession = null;
}
- if (mRouter != null) {
- mRouter.release();
- mRouter = null;
- }
}
public void setListener(Listener listener) {
@@ -130,6 +112,19 @@
mRenderer.setNextContent(request);
}
+ public void setIcon(Bitmap icon) {
+ mMetadataBuilder.putBitmap(MediaMetadata.METADATA_KEY_DISPLAY_ICON, icon);
+ updateMetadata();
+ }
+
+ private void updateMetadata() {
+ // This is a mild abuse of metadata and shouldn't be duplicated in real
+ // code
+ if (mSession != null && mSession.isActive()) {
+ mSession.setMetadata(mMetadataBuilder.build());
+ }
+ }
+
private void updateState(int newState) {
float rate = newState == PlaybackState.STATE_PLAYING ? 1 : 0;
long position = mRenderer == null ? -1 : mRenderer.getSeekPosition();
@@ -140,6 +135,14 @@
mSession.setPlaybackState(mPlaybackState);
}
+ private void initMetadata() {
+ mMetadataBuilder = new MediaMetadata.Builder();
+ mMetadataBuilder.putString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE,
+ "OneMedia display title");
+ mMetadataBuilder.putString(MediaMetadata.METADATA_KEY_DISPLAY_SUBTITLE,
+ "OneMedia display subtitle");
+ }
+
public interface Listener {
public void onPlayStateChanged(PlaybackState state);
}
@@ -239,63 +242,4 @@
mRenderer.onPause();
}
}
-
- private class RoutingCallback extends MediaRouter.RoutingCallback {
- @Override
- public void onConnectionStateChanged(int state) {
- if (state == MediaRouter.CONNECTION_STATE_CONNECTING) {
- if (mRenderer != null) {
- mRenderer.onStop();
- }
- mRenderer = null;
- updateState(PlaybackState.STATE_CONNECTING);
- return;
- }
-
- MediaRouter.ConnectionInfo connection = mRouter.getConnection();
- if (connection != null) {
- MediaPlayerProtocol protocol =
- connection.getProtocolObject(MediaPlayerProtocol.class);
- if (protocol != null) {
- Log.d(TAG, "Connected to route using media player protocol");
-
- protocol.setCallback(new PlayerCallback(), null);
- mRenderer = new OneMRPRenderer(protocol);
- updateState(PlaybackState.STATE_NONE);
- return;
- }
- }
-
- // Use local route
- mRenderer = new LocalRenderer(mContext, null);
- mRenderer.registerListener(mRenderListener);
- updateState(PlaybackState.STATE_NONE);
- }
- }
-
- private class PlayerCallback extends MediaPlayerProtocol.Callback {
- @Override
- public void onStatusUpdated(MediaStatus status, Bundle extras) {
- if (status != null) {
- Log.d(TAG, "Received status update: " + status.toBundle());
- switch (status.getPlayerState()) {
- case MediaStatus.PLAYER_STATE_BUFFERING:
- updateState(PlaybackState.STATE_BUFFERING);
- break;
- case MediaStatus.PLAYER_STATE_IDLE:
- updateState(PlaybackState.STATE_STOPPED);
- break;
- case MediaStatus.PLAYER_STATE_PAUSED:
- updateState(PlaybackState.STATE_PAUSED);
- break;
- case MediaStatus.PLAYER_STATE_PLAYING:
- updateState(PlaybackState.STATE_PLAYING);
- break;
- case MediaStatus.PLAYER_STATE_UNKNOWN:
- updateState(PlaybackState.STATE_NONE);
- break;
- }
- }
- }
- }
}
diff --git a/tests/OneMedia/src/com/android/onemedia/playback/OneMRPRenderer.java b/tests/OneMedia/src/com/android/onemedia/playback/OneMRPRenderer.java
deleted file mode 100644
index 55eb92c..0000000
--- a/tests/OneMedia/src/com/android/onemedia/playback/OneMRPRenderer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.android.onemedia.playback;
-
-import android.os.Bundle;
-import android.support.media.protocols.MediaPlayerProtocol;
-import android.support.media.protocols.MediaPlayerProtocol.MediaInfo;
-
-/**
- * Renderer for communicating with the OneMRP route
- */
-public class OneMRPRenderer extends Renderer {
- private final MediaPlayerProtocol mProtocol;
-
- public OneMRPRenderer(MediaPlayerProtocol protocol) {
- super(null, null);
- mProtocol = protocol;
- }
-
- @Override
- public void setContent(Bundle request) {
- MediaInfo mediaInfo = new MediaInfo(request.getString(RequestUtils.EXTRA_KEY_SOURCE),
- MediaInfo.STREAM_TYPE_BUFFERED, "audio/mp3");
- mProtocol.load(mediaInfo, true, 0, null);
- }
-
- @Override
- public boolean onStop() {
- mProtocol.stop(null);
- return true;
- }
-
- @Override
- public boolean onPlay() {
- mProtocol.play(null);
- return true;
- }
-
- @Override
- public boolean onPause() {
- mProtocol.pause(null);
- return true;
- }
-
- @Override
- public long getSeekPosition() {
- return -1;
- }
-}
diff --git a/tests/OneMedia/src/com/android/onemedia/playback/RequestUtils.java b/tests/OneMedia/src/com/android/onemedia/playback/RequestUtils.java
index 3778c5f..1688395 100644
--- a/tests/OneMedia/src/com/android/onemedia/playback/RequestUtils.java
+++ b/tests/OneMedia/src/com/android/onemedia/playback/RequestUtils.java
@@ -26,6 +26,12 @@
public class RequestUtils {
public static final String ACTION_SET_CONTENT = "set_content";
public static final String ACTION_SET_NEXT_CONTENT = "set_next_content";
+ public static final String ACTION_PAUSE = "com.android.onemedia.pause";
+ public static final String ACTION_PLAY = "com.android.onemedia.play";
+ public static final String ACTION_REW = "com.android.onemedia.rew";
+ public static final String ACTION_FFWD = "com.android.onemedia.ffwd";
+ public static final String ACTION_PREV = "com.android.onemedia.prev";
+ public static final String ACTION_NEXT = "com.android.onemedia.next";
public static final String EXTRA_KEY_SOURCE = "source";
public static final String EXTRA_KEY_METADATA = "metadata";
diff --git a/tests/OneMedia/src/com/android/onemedia/provider/OneMediaRouteProvider.java b/tests/OneMedia/src/com/android/onemedia/provider/OneMediaRouteProvider.java
deleted file mode 100644
index 5845e48..0000000
--- a/tests/OneMedia/src/com/android/onemedia/provider/OneMediaRouteProvider.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.onemedia.provider;
-
-import android.media.routing.MediaRouteSelector;
-import android.media.routing.MediaRouteService;
-import android.media.routing.MediaRouter.ConnectionInfo;
-import android.media.routing.MediaRouter.ConnectionRequest;
-import android.media.routing.MediaRouter.DestinationInfo;
-import android.media.routing.MediaRouter.DiscoveryRequest;
-import android.media.routing.MediaRouter.RouteInfo;
-import android.media.session.PlaybackState;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Process;
-import android.support.media.protocols.MediaPlayerProtocol;
-import android.support.media.protocols.MediaPlayerProtocol.MediaInfo;
-import android.support.media.protocols.MediaPlayerProtocol.MediaStatus;
-import android.os.Looper;
-import android.os.ResultReceiver;
-import android.os.SystemClock;
-import android.util.Log;
-
-import com.android.onemedia.playback.LocalRenderer;
-import com.android.onemedia.playback.Renderer;
-import com.android.onemedia.playback.RequestUtils;
-
-import java.util.ArrayList;
-
-/**
- * Test of MediaRouteProvider. Show a dummy provider with a simple interface for
- * playing music.
- */
-public class OneMediaRouteProvider extends MediaRouteService {
- private static final String TAG = "OneMRP";
- private static final boolean DEBUG = true;
-
- private static final String TEST_DESTINATION_ID = "testDestination";
- private static final String TEST_ROUTE_ID = "testRoute";
-
- private Renderer mRenderer;
- private RenderListener mRenderListener;
- private PlaybackState mPlaybackState;
- private Handler mHandler;
-
- private OneStub mStub;
-
- @Override
- public void onCreate() {
- mHandler = new Handler();
- mRenderer = new LocalRenderer(this, null);
- mRenderListener = new RenderListener();
- PlaybackState.Builder bob = new PlaybackState.Builder();
- bob.setActions(PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_PLAY);
- mPlaybackState = bob.build();
-
- mRenderer.registerListener(mRenderListener);
- }
-
- @Override
- public ClientSession onCreateClientSession(ClientInfo client) {
- if (client.getUid() != Process.myUid()) {
- // for testing purposes, only allow connections from this application
- // since this provider is not fully featured
- return null;
- }
- return new OneSession(client);
- }
-
- private final class OneSession extends ClientSession {
- private final ClientInfo mClient;
-
- public OneSession(ClientInfo client) {
- mClient = client;
- }
-
- @Override
- public boolean onStartDiscovery(DiscoveryRequest req, DiscoveryCallback callback) {
- for (MediaRouteSelector selector : req.getSelectors()) {
- if (isMatch(selector)) {
- DestinationInfo destination = new DestinationInfo.Builder(
- TEST_DESTINATION_ID, getServiceMetadata(), "OneMedia")
- .setDescription("Test route from OneMedia app.")
- .build();
- ArrayList<RouteInfo> routes = new ArrayList<RouteInfo>();
- routes.add(new RouteInfo.Builder(
- TEST_ROUTE_ID, destination, selector).build());
- callback.onDestinationFound(destination, routes);
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void onStopDiscovery() {
- }
-
- @Override
- public boolean onConnect(ConnectionRequest req, ConnectionCallback callback) {
- if (req.getRoute().getId().equals(TEST_ROUTE_ID)) {
- mStub = new OneStub();
- ConnectionInfo connection = new ConnectionInfo.Builder(req.getRoute())
- .setProtocolStub(MediaPlayerProtocol.class, mStub)
- .build();
- callback.onConnected(connection);
- return true;
- }
- return false;
- }
-
- @Override
- public void onDisconnect() {
- mStub = null;
- }
-
- private boolean isMatch(MediaRouteSelector selector) {
- if (!selector.containsProtocol(MediaPlayerProtocol.class)) {
- return false;
- }
- for (String protocol : selector.getRequiredProtocols()) {
- if (!protocol.equals(MediaPlayerProtocol.class.getName())) {
- return false;
- }
- }
- return true;
- }
- }
-
- private final class OneStub extends MediaPlayerProtocol.Stub {
- MediaInfo mMediaInfo;
-
- public OneStub() {
- super(mHandler);
- }
-
- @Override
- public void onLoad(MediaInfo mediaInfo, boolean autoplay, long playPosition,
- Bundle extras) {
- if (DEBUG) {
- Log.d(TAG, "Attempting to play " + mediaInfo.getContentId());
- }
- // look up the route and send a play command to it
- mMediaInfo = mediaInfo;
- Bundle bundle = new Bundle();
- bundle.putString(RequestUtils.EXTRA_KEY_SOURCE, mediaInfo.getContentId());
- mRenderer.setContent(bundle);
- }
-
- @Override
- public void onPlay(Bundle extras) {
- mRenderer.onPlay();
- }
-
- @Override
- public void onPause(Bundle extras) {
- mRenderer.onPause();
- }
- }
-
- private class RenderListener implements Renderer.Listener {
-
- @Override
- public void onError(int type, int extra, Bundle extras, Throwable error) {
- Log.d(TAG, "Sending onError with type " + type + " and extra " + extra);
- sendStatusUpdate(PlaybackState.STATE_ERROR);
- }
-
- @Override
- public void onStateChanged(int newState) {
- long position = -1;
- if (mRenderer != null) {
- position = mRenderer.getSeekPosition();
- }
- int pbState;
- float rate = 0;
- String errorMsg = null;
- switch (newState) {
- case Renderer.STATE_ENDED:
- case Renderer.STATE_STOPPED:
- pbState = PlaybackState.STATE_STOPPED;
- break;
- case Renderer.STATE_INIT:
- case Renderer.STATE_PREPARING:
- pbState = PlaybackState.STATE_BUFFERING;
- break;
- case Renderer.STATE_ERROR:
- pbState = PlaybackState.STATE_ERROR;
- break;
- case Renderer.STATE_PAUSED:
- pbState = PlaybackState.STATE_PAUSED;
- break;
- case Renderer.STATE_PLAYING:
- pbState = PlaybackState.STATE_PLAYING;
- rate = 1;
- break;
- default:
- pbState = PlaybackState.STATE_ERROR;
- errorMsg = "unknown state";
- break;
- }
- PlaybackState.Builder bob = new PlaybackState.Builder(mPlaybackState);
- bob.setState(pbState, position, rate, SystemClock.elapsedRealtime());
- bob.setErrorMessage(errorMsg);
- mPlaybackState = bob.build();
-
- sendStatusUpdate(mPlaybackState.getState());
- }
-
- @Override
- public void onBufferingUpdate(int percent) {
- }
-
- @Override
- public void onFocusLost() {
- Log.d(TAG, "Focus lost, pausing");
- // Don't update state here, we'll get a separate call to
- // onStateChanged when it pauses
- mRenderer.onPause();
- }
-
- @Override
- public void onNextStarted() {
- }
-
- private void sendStatusUpdate(int state) {
- if (mStub != null) {
- MediaStatus status = new MediaStatus(1, mStub.mMediaInfo);
- switch (state) {
- case PlaybackState.STATE_BUFFERING:
- case PlaybackState.STATE_FAST_FORWARDING:
- case PlaybackState.STATE_REWINDING:
- case PlaybackState.STATE_SKIPPING_TO_NEXT:
- case PlaybackState.STATE_SKIPPING_TO_PREVIOUS:
- status.setPlayerState(MediaStatus.PLAYER_STATE_BUFFERING);
- break;
- case PlaybackState.STATE_CONNECTING:
- case PlaybackState.STATE_STOPPED:
- status.setPlayerState(MediaStatus.PLAYER_STATE_IDLE);
- break;
- case PlaybackState.STATE_PAUSED:
- status.setPlayerState(MediaStatus.PLAYER_STATE_PAUSED);
- break;
- case PlaybackState.STATE_PLAYING:
- status.setPlayerState(MediaStatus.PLAYER_STATE_PLAYING);
- break;
- case PlaybackState.STATE_NONE:
- case PlaybackState.STATE_ERROR:
- default:
- status.setPlayerState(MediaStatus.PLAYER_STATE_UNKNOWN);
- break;
- }
- mStub.sendStatusUpdatedEvent(status, null);
- }
- }
- }
-}
diff --git a/tests/UsesFeature2Test/AndroidManifest.xml b/tests/UsesFeature2Test/AndroidManifest.xml
index 6b6c4da..8caf4a1 100644
--- a/tests/UsesFeature2Test/AndroidManifest.xml
+++ b/tests/UsesFeature2Test/AndroidManifest.xml
@@ -33,12 +33,5 @@
<uses-feature android:name="android.hardware.opengles.aep" />
</feature-group>
- <application android:label="@string/app_title">
- <activity android:name="ActivityMain">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
+ <application android:label="@string/app_title" android:hasCode="false" />
</manifest>
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 700afa1..4ce5045 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -66,6 +66,8 @@
libexpat \
libziparchive-host
+aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
+
ifeq ($(HOST_OS),linux)
aaptHostLdLibs += -lrt -ldl -lpthread
endif
@@ -91,6 +93,7 @@
LOCAL_CFLAGS += -Wno-format-y2k
LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
+LOCAL_CFLAGS += $(aaptCFlags)
ifeq (darwin,$(HOST_OS))
LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
endif
@@ -110,7 +113,9 @@
LOCAL_STATIC_LIBRARIES += \
libaapt \
$(aaptHostStaticLibs)
+
LOCAL_LDLIBS += $(aaptHostLdLibs)
+LOCAL_CFLAGS += $(aaptCFlags)
include $(BUILD_HOST_EXECUTABLE)
@@ -128,7 +133,9 @@
LOCAL_STATIC_LIBRARIES += \
libaapt \
$(aaptHostStaticLibs)
+
LOCAL_LDLIBS += $(aaptHostLdLibs)
+LOCAL_CFLAGS += $(aaptCFlags)
include $(BUILD_HOST_NATIVE_TEST)
@@ -159,6 +166,7 @@
libstlport_static \
libexpat_static
+LOCAL_CFLAGS += $(aaptCFlags)
LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
include $(BUILD_EXECUTABLE)
diff --git a/tools/aapt/ApkBuilder.cpp b/tools/aapt/ApkBuilder.cpp
index 12f6040..01e02e2 100644
--- a/tools/aapt/ApkBuilder.cpp
+++ b/tools/aapt/ApkBuilder.cpp
@@ -85,11 +85,24 @@
if (mName.size() > 0) {
mName.append(",");
mDirName.append("_");
+ mPackageSafeName.append(".");
}
String8 configStr = iter->toString();
+ String8 packageConfigStr(configStr);
+ size_t len = packageConfigStr.length();
+ if (len > 0) {
+ char* buf = packageConfigStr.lockBuffer(len);
+ for (char* end = buf + len; buf < end; ++buf) {
+ if (*buf == '-') {
+ *buf = '_';
+ }
+ }
+ packageConfigStr.unlockBuffer(len);
+ }
mName.append(configStr);
mDirName.append(configStr);
+ mPackageSafeName.append(packageConfigStr);
}
}
diff --git a/tools/aapt/ApkBuilder.h b/tools/aapt/ApkBuilder.h
index db23c84..0d7f06b 100644
--- a/tools/aapt/ApkBuilder.h
+++ b/tools/aapt/ApkBuilder.h
@@ -95,6 +95,10 @@
return mDirName;
}
+ const android::String8& getPackageSafeName() const {
+ return mPackageSafeName;
+ }
+
bool isBase() const {
return mIsBase;
}
@@ -111,6 +115,7 @@
const bool mIsBase;
String8 mName;
String8 mDirName;
+ String8 mPackageSafeName;
std::set<OutputEntry> mFiles;
};
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 41102fe..bdbf47b 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -24,6 +24,10 @@
using namespace android;
+#ifndef AAPT_VERSION
+ #define AAPT_VERSION ""
+#endif
+
/*
* Show version info. All the cool kids do it.
*/
@@ -32,7 +36,7 @@
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
- printf("Android Asset Packaging Tool, v0.2\n");
+ printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
return 0;
}
@@ -764,12 +768,9 @@
return 1;
}
+ // The dynamicRefTable can be null if there are no resources for this asset cookie.
+ // This fine.
const DynamicRefTable* dynamicRefTable = res.getDynamicRefTableForCookie(assetsCookie);
- if (dynamicRefTable == NULL) {
- fprintf(stderr, "ERROR: failed to find dynamic reference table for asset cookie %d\n",
- assetsCookie);
- return 1;
- }
Asset* asset = NULL;
@@ -992,6 +993,10 @@
bool hasReadCallLogPermission = false;
bool hasWriteCallLogPermission = false;
+ // If an app declares itself as multiArch, we report the
+ // native libraries differently.
+ bool hasMultiArch = false;
+
// This next group of variables is used to implement a group of
// backward-compatibility heuristics necessitated by the addition of
// some new uses-feature constants in 2.1 and 2.2. In most cases, the
@@ -1236,6 +1241,20 @@
if (debuggable != 0) {
printf("application-debuggable\n");
}
+
+ // We must search by name because the multiArch flag hasn't been API
+ // frozen yet.
+ int32_t multiArchIndex = tree.indexOfAttribute(RESOURCES_ANDROID_NAMESPACE,
+ "multiArch");
+ if (multiArchIndex >= 0) {
+ Res_value value;
+ if (tree.getAttributeValue(multiArchIndex, &value) != NO_ERROR) {
+ if (value.dataType >= Res_value::TYPE_FIRST_INT &&
+ value.dataType <= Res_value::TYPE_LAST_INT) {
+ hasMultiArch = value.data;
+ }
+ }
+ }
} else if (tag == "uses-sdk") {
int32_t code = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error);
if (error != "") {
@@ -1676,12 +1695,8 @@
String8 name = getResolvedAttribute(&res, tree, NAME_ATTR, &error);
if (name != "" && error == "") {
- int required = getIntegerAttribute(tree, REQUIRED_ATTR, NULL, 1);
- top.features.add(name, required);
- if (required) {
- addParentFeatures(&top, name);
- }
-
+ top.features.add(name, true);
+ addParentFeatures(&top, name);
} else {
int vers = getIntegerAttribute(tree, GL_ES_VERSION_ATTR, &error);
if (error == "") {
@@ -2051,12 +2066,54 @@
AssetDir* dir = assets.openNonAssetDir(assetsCookie, "lib");
if (dir != NULL) {
if (dir->getFileCount() > 0) {
- printf("native-code:");
+ SortedVector<String8> architectures;
for (size_t i=0; i<dir->getFileCount(); i++) {
- printf(" '%s'", ResTable::normalizeForOutput(
- dir->getFileName(i).string()).string());
+ architectures.add(ResTable::normalizeForOutput(
+ dir->getFileName(i).string()));
}
- printf("\n");
+
+ bool outputAltNativeCode = false;
+ // A multiArch package is one that contains 64-bit and
+ // 32-bit versions of native code and expects 3rd-party
+ // apps to load these native code libraries. Since most
+ // 64-bit systems also support 32-bit apps, the apps
+ // loading this multiArch package's code may be either
+ // 32-bit or 64-bit.
+ if (hasMultiArch) {
+ // If this is a multiArch package, report the 64-bit
+ // version only. Then as a separate entry, report the
+ // rest.
+ //
+ // If we report the 32-bit architecture, this APK will
+ // be installed on a 32-bit device, causing a large waste
+ // of bandwidth and disk space. This assumes that
+ // the developer of the multiArch package has also
+ // made a version that is 32-bit only.
+ String8 intel64("x86_64");
+ String8 arm64("arm64-v8a");
+ ssize_t index = architectures.indexOf(intel64);
+ if (index < 0) {
+ index = architectures.indexOf(arm64);
+ }
+
+ if (index >= 0) {
+ printf("native-code: '%s'\n", architectures[index].string());
+ architectures.removeAt(index);
+ outputAltNativeCode = true;
+ }
+ }
+
+ const size_t archCount = architectures.size();
+ if (archCount > 0) {
+ if (outputAltNativeCode) {
+ printf("alt-");
+ }
+ printf("native-code:");
+ for (size_t i = 0; i < archCount; i++) {
+ printf(" '%s'", architectures[i].string());
+ }
+ printf("\n");
+ }
}
delete dir;
}
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index cf3dd0a..137c85c 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -485,9 +485,13 @@
find_max_opacity(image->rows, innerStartX, innerStartY, innerMidX, innerMidY, 1, 1,
&diagonalInset);
- // Determine source radius based upon inset
- // radius = 1 / (sqrt(2) - 1) * inset
- image->outlineRadius = 2.4142f * diagonalInset;
+ /* Determine source radius based upon inset:
+ * sqrt(r^2 + r^2) = sqrt(i^2 + i^2) + r
+ * sqrt(2) * r = sqrt(2) * i + r
+ * (sqrt(2) - 1) * r = sqrt(2) * i
+ * r = sqrt(2) / (sqrt(2) - 1) * i
+ */
+ image->outlineRadius = 3.4142f * diagonalInset;
NOISY(printf("outline insets %d %d %d %d, rad %f, alpha %x\n",
image->outlineInsetsLeft,
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 2401b3a..0a80805 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -937,8 +937,8 @@
}
// Add the 'split' attribute which describes the configurations included.
- String8 splitName("config_");
- splitName.append(split->getDirectorySafeName());
+ String8 splitName("config.");
+ splitName.append(split->getPackageSafeName());
manifest->addAttribute(String16(), String16("split"), String16(splitName));
// Build an empty <application> tag (required).
@@ -1470,6 +1470,8 @@
String16 action16("action");
String16 category16("category");
String16 data16("scheme");
+ String16 feature_group16("feature-group");
+ String16 uses_feature16("uses-feature");
const char* packageIdentChars = "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ._0123456789";
const char* packageIdentCharsWithTheStupid = "abcdefghijklmnopqrstuvwxyz"
@@ -1680,10 +1682,43 @@
schemeIdentChars, true) != ATTR_OKAY) {
hasErrors = true;
}
+ } else if (strcmp16(block.getElementName(&len), feature_group16.string()) == 0) {
+ int depth = 1;
+ while ((code=block.next()) != ResXMLTree::END_DOCUMENT
+ && code > ResXMLTree::BAD_DOCUMENT) {
+ if (code == ResXMLTree::START_TAG) {
+ depth++;
+ if (strcmp16(block.getElementName(&len), uses_feature16.string()) == 0) {
+ ssize_t idx = block.indexOfAttribute(
+ RESOURCES_ANDROID_NAMESPACE, "required");
+ if (idx < 0) {
+ continue;
+ }
+
+ int32_t data = block.getAttributeData(idx);
+ if (data == 0) {
+ fprintf(stderr, "%s:%d: Tag <uses-feature> can not have "
+ "android:required=\"false\" when inside a "
+ "<feature-group> tag.\n",
+ manifestPath.string(), block.getLineNumber());
+ hasErrors = true;
+ }
+ }
+ } else if (code == ResXMLTree::END_TAG) {
+ depth--;
+ if (depth == 0) {
+ break;
+ }
+ }
+ }
}
}
}
+ if (hasErrors) {
+ return UNKNOWN_ERROR;
+ }
+
if (resFile != NULL) {
// These resources are now considered to be a part of the included
// resources, for others to reference.
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index cf1d4fd..c98808f 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -484,15 +484,6 @@
attr.hasErrors = true;
}
- // Make sure an id is defined for this enum/flag identifier...
- if (!attr.hasErrors && !outTable->hasBagOrEntry(itemIdent, &id16, &myPackage)) {
- err = outTable->startBag(SourcePos(in->getPrintableSource(), block.getLineNumber()),
- myPackage, id16, itemIdent, String16(), NULL);
- if (err != NO_ERROR) {
- attr.hasErrors = true;
- }
- }
-
if (!attr.hasErrors) {
if (enumOrFlagsComment.size() == 0) {
enumOrFlagsComment.append(mayOrMust(attr.type,
@@ -2508,11 +2499,13 @@
sp<Type> attr = p->getType(String16("attr"), unknown);
// Assign indices...
- for (ti=0; ti<N; ti++) {
+ const size_t typeCount = p->getOrderedTypes().size();
+ for (size_t ti = 0; ti < typeCount; ti++) {
sp<Type> t = p->getOrderedTypes().itemAt(ti);
if (t == NULL) {
continue;
}
+
err = t->applyPublicEntryOrder();
if (err != NO_ERROR && firstError == NO_ERROR) {
firstError = err;
@@ -2534,7 +2527,7 @@
}
// Assign resource IDs to keys in bags...
- for (ti=0; ti<N; ti++) {
+ for (size_t ti = 0; ti < typeCount; ti++) {
sp<Type> t = p->getOrderedTypes().itemAt(ti);
if (t == NULL) {
continue;
@@ -3296,11 +3289,16 @@
Item item(sourcePos, false, value, style);
if (mType == TYPE_BAG) {
- const Item& item(mBag.valueAt(0));
- sourcePos.error("Resource entry %s is already defined as a bag.\n"
- "%s:%d: Originally defined here.\n",
- String8(mName).string(),
- item.sourcePos.file.string(), item.sourcePos.line);
+ if (mBag.size() == 0) {
+ sourcePos.error("Resource entry %s is already defined as a bag.",
+ String8(mName).string());
+ } else {
+ const Item& item(mBag.valueAt(0));
+ sourcePos.error("Resource entry %s is already defined as a bag.\n"
+ "%s:%d: Originally defined here.\n",
+ String8(mName).string(),
+ item.sourcePos.file.string(), item.sourcePos.line);
+ }
return UNKNOWN_ERROR;
}
if ( (mType != TYPE_UNKNOWN) && (overwrite == false) ) {
@@ -3374,6 +3372,9 @@
if (it.isId) {
if (!table->hasBagOrEntry(key, &id16, &package)) {
String16 value("false");
+ NOISY(fprintf(stderr, "Generating %s:id/%s\n",
+ String8(package).string(),
+ String8(key).string()));
status_t err = table->addEntry(SourcePos(String8("<generated>"), 0), package,
id16, key, value);
if (err != NO_ERROR) {
diff --git a/tools/layoutlib/.idea/copyright/profiles_settings.xml b/tools/layoutlib/.idea/copyright/profiles_settings.xml
index e7bedf3..20145de 100644
--- a/tools/layoutlib/.idea/copyright/profiles_settings.xml
+++ b/tools/layoutlib/.idea/copyright/profiles_settings.xml
@@ -1,3 +1,3 @@
<component name="CopyrightManager">
- <settings default="" />
+ <settings default="Android" />
</component>
\ No newline at end of file
diff --git a/tools/layoutlib/bridge/resources/bars/README b/tools/layoutlib/bridge/resources/bars/README
new file mode 100644
index 0000000..c84ef80
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/README
@@ -0,0 +1,8 @@
+The directory contains the resources for StatusBar and Navigation Bar.
+
+The resources are not arranged as per the standard resources configuration.
+They are stored per API. However, to prevent duplication of resources, each API
+resource directory is used as a backup for all earlier API levels.
+
+For example, for the back icon for ICS, we search first in v18, where we don't
+find it, and then in v19.
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..f17189a
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..2a9757d
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/status_bar.xml b/tools/layoutlib/bridge/resources/bars/status_bar.xml
index 51b474d..04571e1 100644
--- a/tools/layoutlib/bridge/resources/bars/status_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/status_bar.xml
@@ -1,17 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
- <ImageView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginTop="1dp"/>
- <ImageView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="5dp"
- android:layout_marginTop="1dp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+ <!-- The exact size of the wifi icon is specified in order to scale it properly.
+ Without scaling, it appeared huge. This is currently, 70% of the actual size. -->
+ <ImageView
+ android:layout_height="22.4dp"
+ android:layout_width="20.65dp"
+ android:layout_marginTop="1dp"/>
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginLeft="3dp"
+ android:layout_marginRight="5dp"
+ android:layout_marginTop="4dp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:layout_marginRight="5dp"
+ android:gravity="center_vertical"
+ android:textSize="16dp"
+ android:fontFamily="sans-serif-medium"/>
</merge>
diff --git a/tools/layoutlib/bridge/resources/bars/v11/README b/tools/layoutlib/bridge/resources/bars/v11/README
deleted file mode 100644
index ae094e2..0000000
--- a/tools/layoutlib/bridge/resources/bars/v11/README
+++ /dev/null
@@ -1 +0,0 @@
-Resources for Api level 11-20
diff --git a/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..c920ec4
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..6248cfd
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..943332e
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..441de0c
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..36c61e1
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..459a1a2
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_home.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_home.png
rename to tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_home.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/hdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/hdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v19/hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..6248cfd
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/hdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-hdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-hdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-hdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-hdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-hdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-mdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-mdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-mdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-mdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-xhdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/ldrtl-xhdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/ldrtl-xhdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/ldrtl-xhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_home.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_home.png
rename to tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_home.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/mdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/mdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v19/mdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..441de0c
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/mdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_back.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_back.png
rename to tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_home.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_home.png
rename to tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_recent.png
similarity index 100%
rename from tools/layoutlib/bridge/resources/bars/v11/xhdpi/ic_sysbar_recent.png
rename to tools/layoutlib/bridge/resources/bars/v19/xhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v19/xhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..459a1a2
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/xhdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_back.png b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_back.png
new file mode 100644
index 0000000..79cfcee
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_back.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_home.png b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_home.png
new file mode 100644
index 0000000..64f6a22
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_home.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_recent.png b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_recent.png
new file mode 100644
index 0000000..6e0b071
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/ic_sysbar_recent.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..494b005
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v19/xxhdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..f17189a
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index 829378e..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_battery_charge_anim100.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 931daed..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/hdpi/stat_sys_wifi_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png
deleted file mode 100644
index a4be298..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/hdpi/status_bar_background.9.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..2a9757d
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index 2773a70..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_battery_charge_anim100.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 6e1ac91..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/mdpi/stat_sys_wifi_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png b/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png
deleted file mode 100644
index eb7c1a4..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/mdpi/status_bar_background.9.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..555bcd9
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index c7fd719..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_battery_charge_anim100.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 625c61d..0000000
--- a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.xml b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.xml
new file mode 100644
index 0000000..0498b6c
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v21/xhdpi/stat_sys_wifi_signal_4_fully.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32.0dp"
+ android:height="29.5dp"
+ android:viewportWidth="26.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..6474aad
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v21/xxhdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..754cdf6
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..b5326d2
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v9/hdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v9/ldpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v9/ldpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..7023ea7
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v9/ldpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..17a955d
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..19165ab
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/v9/mdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..555bcd9
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
index f939678..5b69681 100644
--- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
+++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
@@ -91,7 +91,7 @@
// first count the array size
int count = 0;
for (ResourceValue data : mResourceData) {
- if (data != null) {
+ if (data != null && !RenderResources.REFERENCE_NULL.equals(data.getValue())) {
count++;
}
}
@@ -103,7 +103,8 @@
// fill the array with the indices.
int index = 1;
for (int i = 0 ; i < mResourceData.length ; i++) {
- if (mResourceData[i] != null) {
+ if (mResourceData[i] != null
+ && !RenderResources.REFERENCE_NULL.equals(mResourceData[i].getValue())) {
mIndices[index++] = i;
}
}
diff --git a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
index bf4e288..bd80cb8 100644
--- a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
@@ -26,11 +26,12 @@
import java.awt.Font;
import java.awt.FontFormatException;
import java.io.File;
+import java.io.FileNotFoundException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Scanner;
import java.util.Set;
import static android.graphics.Typeface_Delegate.SYSTEM_FONTS;
@@ -54,14 +55,7 @@
private static final String FONT_SUFFIX_BOLDITALIC = "BoldItalic.ttf";
private static final String FONT_SUFFIX_BOLD = "Bold.ttf";
private static final String FONT_SUFFIX_ITALIC = "Italic.ttf";
-
- private static final Set<String> MISSING_FONTS =
- Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
- "NotoSansHans-Regular.otf",
- "NotoSansHant-Regular.otf",
- "NotoSansJP-Regular.otf",
- "NotoSansKR-Regular.otf"
- )));
+ private static final String FN_ALL_FONTS_LIST = "fontsInSdk.txt";
/**
* A class associating {@link Font} with its metadata.
@@ -80,6 +74,7 @@
private static String sFontLocation;
private static final List<FontFamily_Delegate> sPostInitDelegate = new
ArrayList<FontFamily_Delegate>();
+ private static Set<String> SDK_FONTS;
// ---- delegate data ----
@@ -113,6 +108,31 @@
public static synchronized void setFontLocation(String fontLocation) {
sFontLocation = fontLocation;
+ // init list of bundled fonts.
+ File allFonts = new File(fontLocation, FN_ALL_FONTS_LIST);
+ // Current number of fonts is 103. Use the next round number to leave scope for more fonts
+ // in the future.
+ Set<String> allFontsList = new HashSet<String>(128);
+ Scanner scanner = null;
+ try {
+ scanner = new Scanner(allFonts);
+ while (scanner.hasNext()) {
+ String name = scanner.next();
+ // Skip font configuration files.
+ if (!name.endsWith(".xml")) {
+ allFontsList.add(name);
+ }
+ }
+ } catch (FileNotFoundException e) {
+ Bridge.getLog().error(LayoutLog.TAG_BROKEN,
+ "Unable to load the list of fonts. Try re-installing the SDK Platform from the SDK Manager.",
+ e, null);
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ SDK_FONTS = Collections.unmodifiableSet(allFontsList);
for (FontFamily_Delegate fontFamily : sPostInitDelegate) {
fontFamily.init();
}
@@ -225,13 +245,6 @@
/*package*/ static boolean nAddFont(long nativeFamily, String path) {
FontFamily_Delegate delegate = getDelegate(nativeFamily);
if (delegate != null) {
- // If the font to be added is known to be missing from the SDK, don't try to load it and
- // mark the FontFamily to be not valid.
- if (path.startsWith(SYSTEM_FONTS) &&
- MISSING_FONTS.contains(path.substring(SYSTEM_FONTS.length()))) {
- return delegate.mValid = false;
- }
- delegate.mValid = true;
if (sFontLocation == null) {
delegate.mPath.add(path);
return true;
@@ -259,6 +272,14 @@
}
private boolean addFont(String path) {
+ // If the font is not in the list of fonts bundled with the SDK, don't try to load it and
+ // mark the FontFamily to be not valid.
+ if (path.startsWith(SYSTEM_FONTS) &&
+ !SDK_FONTS.contains(path.substring(SYSTEM_FONTS.length()))) {
+ return mValid = false;
+ }
+ // Set valid to true, even if the font fails to load.
+ mValid = true;
Font font = loadFont(path);
if (font == null) {
return false;
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 09b57fe..f8bc2ae 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -444,7 +444,8 @@
}
@Override
- public void keyguardGoingAway() throws RemoteException {
+ public void keyguardGoingAway(boolean disableWindowAnimations,
+ boolean keyguardGoingToNotificationShade) throws RemoteException {
}
@Override
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
index 089cad3..16b54f1 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
@@ -16,31 +16,103 @@
package com.android.layoutlib.bridge.bars;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static android.os.Build.VERSION_CODES.*;
+
/**
* Various helper methods to simulate older versions of platform.
*/
public class Config {
- public static final String DEFAULT_RESOURCE_DIR = "/bars/v21/";
+ // each of these resource dirs must end in '/'
+ private static final String GINGERBREAD_DIR = "/bars/v9/";
+ private static final String JELLYBEAN_DIR = "/bars/v18/";
+ private static final String KITKAT_DIR = "/bars/v19/";
+ private static final String DEFAULT_RESOURCE_DIR = "/bars/v21/";
+
+ private static final List<String> sDefaultResourceDir =
+ Collections.singletonList(DEFAULT_RESOURCE_DIR);
+
+ private static final int WHITE = 0xFFFFFFFF;
+ private static final int BLACK = 0xFF000000;
public static boolean showOnScreenNavBar(int platformVersion) {
- // return true if ICS or later.
- return platformVersion >= 14 || platformVersion == 0;
+ return platformVersion == 0 || platformVersion >= ICE_CREAM_SANDWICH;
}
public static int getStatusBarColor(int platformVersion) {
// return white for froyo and earlier; black otherwise.
- return platformVersion >= 9 || platformVersion == 0 ? 0xFF000000 : 0xFFFFFFFF;
+ return platformVersion == 0 || platformVersion >= GINGERBREAD ? BLACK : WHITE;
}
- public static boolean usesCustomResourceDir(int platformVersion) {
- return platformVersion > 10 && platformVersion < 21;
- }
-
- public static String getResourceDir(int platformVersion) {
- if (usesCustomResourceDir(platformVersion)) {
- return "/bars/v11/";
+ public static List<String> getResourceDirs(int platformVersion) {
+ // Special case the most used scenario.
+ if (platformVersion == 0) {
+ return sDefaultResourceDir;
}
- return DEFAULT_RESOURCE_DIR;
+ List<String> list = new ArrayList<String>(4);
+ // Gingerbread - uses custom battery and wifi icons.
+ if (platformVersion <= GINGERBREAD) {
+ list.add(GINGERBREAD_DIR);
+ }
+ // ICS - JellyBean uses custom battery, wifi.
+ if (platformVersion <= JELLY_BEAN_MR2) {
+ list.add(JELLYBEAN_DIR);
+ }
+ // KitKat - uses custom wifi and nav icons.
+ if (platformVersion <= KITKAT) {
+ list.add(KITKAT_DIR);
+ }
+ list.add(DEFAULT_RESOURCE_DIR);
+
+ return Collections.unmodifiableList(list);
+ }
+
+ public static String getTime(int platformVersion) {
+ if (platformVersion == 0) {
+ // TODO: revisit when the version is selected.
+ return "4:57";
+ }
+ if (platformVersion < GINGERBREAD) {
+ return "2:20";
+ }
+ if (platformVersion < ICE_CREAM_SANDWICH) {
+ return "2:30";
+ }
+ if (platformVersion < JELLY_BEAN) {
+ return "4:00";
+ }
+ if (platformVersion < KITKAT) {
+ return "4:30";
+ }
+ if (platformVersion <= KITKAT_WATCH) {
+ return "4:40";
+ }
+ // Should never happen.
+ return "4:04";
+ }
+
+ public static int getTimeColor(int platformVersion) {
+ if (platformVersion == 0 || platformVersion >= KITKAT ||
+ platformVersion > FROYO && platformVersion < HONEYCOMB) {
+ // Gingerbread and KitKat onwards.
+ return WHITE;
+ }
+ // Black for froyo.
+ if (platformVersion < GINGERBREAD) {
+ return BLACK;
+ } else if (platformVersion < KITKAT) {
+ // Honeycomb to JB-mr2: Holo blue light.
+ return 0xff33b5e5;
+ }
+ // Should never happen.
+ return WHITE;
+ }
+
+ public static String getWifiIconType(int platformVersion) {
+ return platformVersion == 0 ? "xml" : "png";
}
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
index 4da9f04..13ddf07 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
@@ -47,8 +47,6 @@
import java.io.IOException;
import java.io.InputStream;
-import static com.android.layoutlib.bridge.bars.Config.DEFAULT_RESOURCE_DIR;
-
/**
* Base "bar" class for the window decor around the the edited layout.
* This is basically an horizontal layout that loads a given layout on creation (it is read
@@ -60,11 +58,6 @@
*/
abstract class CustomBar extends LinearLayout {
- // An upper-bound on the length of the path to the directory to find the icon in.
- // This assumes that resource directory name for different api levels have same length.
- private static final int ICON_PATH_LENGTH = DEFAULT_RESOURCE_DIR.length()
- + LayoutDirection.RTL.getResourceValue().length() + 9; // 9 = "-xxxhdpi/".length
-
private final int mSimulatedPlatformVersion;
@@ -97,72 +90,6 @@
}
}
- private InputStream getIcon(String iconName, Density[] densityInOut, LayoutDirection direction,
- StringBuilder[] pathOut, boolean tryOtherDensities) {
- pathOut[0] = new StringBuilder(ICON_PATH_LENGTH + iconName.length());
-
- if (Config.usesCustomResourceDir(mSimulatedPlatformVersion)) {
- // current density.
- Density density = densityInOut[0];
- InputStream stream = getIcon(iconName, Config.getResourceDir(mSimulatedPlatformVersion),
- densityInOut, direction, pathOut, tryOtherDensities);
- if (stream != null) {
- return stream;
- }
- // reset the density.
- densityInOut[0] = density;
- }
- return getIcon(iconName, DEFAULT_RESOURCE_DIR, densityInOut, direction, pathOut,
- tryOtherDensities);
-
- }
-
- private InputStream getIcon(String iconName, String dir, Density[] densityInOut,
- LayoutDirection direction, StringBuilder[] pathOut, boolean tryOtherDensities) {
- // current density
- Density density = densityInOut[0];
-
- pathOut[0].setLength(0);
-
- // bitmap url relative to this class
- if (direction == LayoutDirection.RTL) {
- pathOut[0].append(dir)
- .append(direction.getResourceValue())
- .append('-')
- .append(density.getResourceValue())
- .append('/')
- .append(iconName);
- } else {
- // Since we do not have any ldltr resource, skip the check.
- pathOut[0].append(dir)
- .append(density.getResourceValue())
- .append('/')
- .append(iconName);
- }
-
- InputStream stream = getClass().getResourceAsStream(pathOut[0].toString());
- if (stream == null && tryOtherDensities) {
- for (Density d : Density.values()) {
- if (d != density) {
- densityInOut[0] = d;
- stream = getIcon(iconName, dir, densityInOut, direction, pathOut,
- false /*tryOtherDensities*/);
- if (stream != null) {
- return stream;
- }
- }
- }
- // couldn't find resource with direction qualifier, try without.
- if (direction == LayoutDirection.RTL) {
- densityInOut[0] = density;
- stream = getIcon(iconName, dir, densityInOut, null, pathOut,
- true /*tryOtherDensities*/);
- }
- }
-
- return stream;
- }
-
protected void loadIcon(int index, String iconName, Density density) {
loadIcon(index, iconName, density, false);
}
@@ -172,15 +99,14 @@
if (child instanceof ImageView) {
ImageView imageView = (ImageView) child;
- StringBuilder[] pathOut = new StringBuilder[1];
- Density[] densityInOut = new Density[]{density};
LayoutDirection dir = isRtl ? LayoutDirection.RTL : null;
- InputStream stream = getIcon(iconName, densityInOut, dir, pathOut,
- true /*tryOtherDensities*/);
- density = densityInOut[0];
- String path = pathOut[0].toString();
+ IconLoader iconLoader = new IconLoader(iconName, density, mSimulatedPlatformVersion,
+ dir);
+ InputStream stream = iconLoader.getIcon();
if (stream != null) {
+ density = iconLoader.getDensity();
+ String path = iconLoader.getPath();
// look for a cached bitmap
Bitmap bitmap = Bridge.getCachedBitmap(path, true /*isFramework*/);
if (bitmap == null) {
@@ -201,24 +127,25 @@
}
}
- protected TextView setText(int index, String stringReference) {
+ protected TextView setText(int index, String string, boolean reference) {
View child = getChildAt(index);
if (child instanceof TextView) {
TextView textView = (TextView) child;
- setText(textView, stringReference);
+ setText(textView, string, reference);
return textView;
}
return null;
}
- private void setText(TextView textView, String stringReference) {
- ResourceValue value = getResourceValue(stringReference);
- if (value != null) {
- textView.setText(value.getValue());
- } else {
- textView.setText(stringReference);
+ private void setText(TextView textView, String string, boolean reference) {
+ if (reference) {
+ ResourceValue value = getResourceValue(string);
+ if (value != null) {
+ string = value.getValue();
+ }
}
+ textView.setText(string);
}
protected void setStyle(String themeEntryName) {
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/IconLoader.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/IconLoader.java
new file mode 100644
index 0000000..9ab2e82
--- /dev/null
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/IconLoader.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.layoutlib.bridge.bars;
+
+import com.android.resources.Density;
+import com.android.resources.LayoutDirection;
+
+import java.io.InputStream;
+
+public class IconLoader {
+
+ private final String mIconName;
+ private final Density mDesiredDensity;
+ private final int mPlatformVersion;
+ private final LayoutDirection mDirection;
+
+ private Density mCurrentDensity;
+ private StringBuilder mCurrentPath;
+
+ IconLoader(String iconName, Density density, int platformVersion, LayoutDirection direction) {
+ mIconName = iconName;
+ mDesiredDensity = density;
+ mPlatformVersion = platformVersion;
+ mDirection = direction;
+ // An upper bound on the length of the path for the icon: /bars/v21/ldrtl-xxxhdpi/
+ final int iconPathLength = 24;
+ mCurrentPath = new StringBuilder(iconPathLength + iconName.length());
+ }
+
+ public InputStream getIcon() {
+ for (String resourceDir : Config.getResourceDirs(mPlatformVersion)) {
+ mCurrentDensity = null;
+ InputStream stream = getIcon(resourceDir);
+ if (stream != null) {
+ return stream;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Should only be called after {@link #getIcon()}. Returns the density of the icon, if found by
+ * {@code getIcon()}. If no icon was found, then the return value has no meaning.
+ */
+ public Density getDensity() {
+ return mCurrentDensity;
+ }
+
+ /**
+ * Should only be called after {@link #getIcon()}. Returns the path to the icon, if found by
+ * {@code getIcon()}. If no icon was found, then the return value has no meaning.
+ */
+ public String getPath() {
+ return mCurrentPath.toString();
+ }
+
+ /**
+ * Search for icon in the resource directory. This iterates over all densities.
+ * If a match is found, mCurrentDensity will be set to the icon's density.
+ */
+ private InputStream getIcon(String resourceDir) {
+ // First check for the desired density.
+ InputStream stream = getIcon(resourceDir, mDesiredDensity);
+ if (stream != null) {
+ mCurrentDensity = mDesiredDensity;
+ return stream;
+ }
+ // Didn't find in the desired density. Search in all.
+ for (Density density : Density.values()) {
+ if (density == mDesiredDensity) {
+ // Skip the desired density since it's already been checked.
+ continue;
+ }
+ stream = getIcon(resourceDir, density);
+ if (stream != null) {
+ mCurrentDensity = density;
+ return stream;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the icon for given density present in the given resource directory, taking layout
+ * direction into consideration.
+ */
+ private InputStream getIcon(String resourceDir, Density density) {
+ mCurrentPath.setLength(0);
+ // Currently we don't have any LTR only resources and hence the check is skipped. If they
+ // are ever added, change to:
+ // if (mDirection == LayoutDirection.RTL || mDirection == LayoutDirection.LTR) {
+ if (mDirection == LayoutDirection.RTL) {
+ mCurrentPath.append(resourceDir)
+ .append(mDirection.getResourceValue())
+ .append('-')
+ .append(density.getResourceValue())
+ .append('/')
+ .append(mIconName);
+ InputStream stream = getClass().getResourceAsStream(mCurrentPath.toString());
+ if (stream != null) {
+ return stream;
+ }
+ mCurrentPath.setLength(0);
+ }
+ mCurrentPath.append(resourceDir)
+ .append(density.getResourceValue())
+ .append('/')
+ .append(mIconName);
+ return getClass().getResourceAsStream(mCurrentPath.toString());
+ }
+}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
index 4cbdd4d..c7c62d6 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
@@ -16,22 +16,38 @@
package com.android.layoutlib.bridge.bars;
+import com.android.ide.common.rendering.api.LayoutLog;
+import com.android.layoutlib.bridge.Bridge;
+import com.android.layoutlib.bridge.android.BridgeContext;
+import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
+import com.android.layoutlib.bridge.impl.ParserFactory;
import com.android.resources.Density;
import org.xmlpull.v1.XmlPullParserException;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import java.io.IOException;
+import java.io.InputStream;
+
public class StatusBar extends CustomBar {
+ private final Context mContext;
+ private final int mSimulatedPlatformVersion;
+
public StatusBar(Context context, Density density, int direction, boolean RtlEnabled,
int simulatedPlatformVersion) throws XmlPullParserException {
// FIXME: if direction is RTL but it's not enabled in application manifest, mirror this bar.
super(context, LinearLayout.HORIZONTAL, "/bars/status_bar.xml", "status_bar.xml",
simulatedPlatformVersion);
+ mContext = context;
+ mSimulatedPlatformVersion = simulatedPlatformVersion;
// FIXME: use FILL_H?
setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);
@@ -41,8 +57,44 @@
// created for them.
// We do know the order though.
// 0 is the spacer
- loadIcon(1, "stat_sys_wifi_signal_4_fully.png", density);
- loadIcon(2, "stat_sys_battery_charge_anim100.png", density);
+ loadIcon(1, "stat_sys_wifi_signal_4_fully."
+ + Config.getWifiIconType(simulatedPlatformVersion), density);
+ loadIcon(2, "stat_sys_battery_100.png", density);
+ setText(3, Config.getTime(simulatedPlatformVersion), false)
+ .setTextColor(Config.getTimeColor(simulatedPlatformVersion));
+ }
+
+ @Override
+ protected void loadIcon(int index, String iconName, Density density) {
+ if (!iconName.endsWith(".xml")) {
+ super.loadIcon(index, iconName, density);
+ return;
+ }
+ View child = getChildAt(index);
+ if (child instanceof ImageView) {
+ ImageView imageView = (ImageView) child;
+ // The xml is stored only in xhdpi.
+ IconLoader iconLoader = new IconLoader(iconName, Density.XHIGH,
+ mSimulatedPlatformVersion, null);
+ InputStream stream = iconLoader.getIcon();
+
+ if (stream != null) {
+ try {
+ BridgeXmlBlockParser parser = new BridgeXmlBlockParser(
+ ParserFactory.create(stream, null), (BridgeContext) mContext, true);
+ Drawable drawable = Drawable.createFromXml(mContext.getResources(), parser);
+ if (drawable != null) {
+ imageView.setImageDrawable(drawable);
+ }
+ } catch (XmlPullParserException e) {
+ Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Unable to draw wifi icon", e,
+ null);
+ } catch (IOException e) {
+ Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Unable to draw wifi icon", e,
+ null);
+ }
+ }
+ }
}
@Override
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/TitleBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/TitleBar.java
index ff952bd..10f1383 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/TitleBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/TitleBar.java
@@ -34,7 +34,7 @@
// Cannot access the inside items through id because no R.id values have been
// created for them.
// We do know the order though.
- mTextView = setText(0, label);
+ mTextView = setText(0, label, true);
setStyle("windowTitleBackgroundStyle");
}
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 3c37b94..ac2a176 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -21,7 +21,7 @@
import android.net.IpConfiguration.ProxySettings;
import android.net.IpConfiguration.IpAssignment;
import android.net.ProxyInfo;
-import android.net.LinkProperties;
+import android.net.StaticIpConfiguration;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
@@ -1096,13 +1096,13 @@
}
/** @hide */
- public LinkProperties getLinkProperties() {
- return mIpConfiguration.linkProperties;
+ public StaticIpConfiguration getStaticIpConfiguration() {
+ return mIpConfiguration.getStaticIpConfiguration();
}
/** @hide */
- public void setLinkProperties(LinkProperties linkProperties) {
- mIpConfiguration.linkProperties = linkProperties;
+ public void setStaticIpConfiguration(StaticIpConfiguration staticIpConfiguration) {
+ mIpConfiguration.setStaticIpConfiguration(staticIpConfiguration);
}
/** @hide */
@@ -1126,9 +1126,19 @@
}
/** @hide */
+ public ProxyInfo getHttpProxy() {
+ return mIpConfiguration.httpProxy;
+ }
+
+ /** @hide */
+ public void setHttpProxy(ProxyInfo httpProxy) {
+ mIpConfiguration.httpProxy = httpProxy;
+ }
+
+ /** @hide */
public void setProxy(ProxySettings settings, ProxyInfo proxy) {
mIpConfiguration.proxySettings = settings;
- mIpConfiguration.linkProperties.setHttpProxy(proxy);
+ mIpConfiguration.httpProxy = proxy;
}
/** Implement the Parcelable interface {@hide} */
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index e27bd7e..3d976e7 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1696,6 +1696,7 @@
*
* @hide
*/
+ @SystemApi
public void connect(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
validateChannel();
@@ -1718,6 +1719,7 @@
* initialized again
* @hide
*/
+ @SystemApi
public void connect(int networkId, ActionListener listener) {
if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();
@@ -1742,6 +1744,7 @@
* initialized again
* @hide
*/
+ @SystemApi
public void save(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
validateChannel();
@@ -1761,6 +1764,7 @@
* initialized again
* @hide
*/
+ @SystemApi
public void forget(int netId, ActionListener listener) {
if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();
@@ -1776,6 +1780,7 @@
* initialized again
* @hide
*/
+ @SystemApi
public void disable(int netId, ActionListener listener) {
if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();
diff --git a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
index 50bec33..54237c4 100644
--- a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
+++ b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
@@ -31,15 +31,5 @@
Messenger getMessenger();
int getPasspointState();
-
- List<WifiPasspointPolicy> requestCredentialMatch(in List<ScanResult> requested);
-
- List<WifiPasspointCredential> getCredentials();
-
- boolean addCredential(in WifiPasspointCredential cred);
-
- boolean updateCredential(in WifiPasspointCredential cred);
-
- boolean removeCredential(in WifiPasspointCredential cred);
}
